← Back to branch summary

~jelmer/bzr-builddeb/83122-devscripts-dep

« back to all changes in this revision

Viewing changes to cmds.py

  • Committer: James Westby
  • Date: 2011-03-22 18:59:16 UTC
  • mfrom: (526.5.1 trunk)
  • Revision ID: james.westby@linaro.org-20110322185916-55ce07sqcs9v70yp
Only look for the previous upload if --package-merge is specified.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmds.py
356
356
                build_type = config.build_type
357
357
            contains_upstream_source = tree_contains_upstream_source(tree)
358
358
            (changelog, larstiq) = find_changelog(tree, not contains_upstream_source)
359
 
            try:
360
 
                prev_version = find_previous_upload(tree, not contains_upstream_source)
361
 
            except NoPreviousUpload:
362
 
                prev_version = None
363
359
            if build_type is None:
364
360
                build_type = guess_build_type(tree, changelog.version,
365
361
                    contains_upstream_source)
367
363
            note("Building package in %s mode" % build_type)
368
364
 
369
365
            if package_merge:
 
366
                try:
 
367
                    prev_version = find_previous_upload(tree, not contains_upstream_source)
 
368
                except NoPreviousUpload:
 
369
                    prev_version = None
370
370
                build_options.append("-v%s" % str(prev_version))
371
371
                if (prev_version.upstream_version
372
372
                        != changelog.version.upstream_version