← Back to branch summary

~marienz/bzr-builddeb/initial-merge-upstream

« back to all changes in this revision

Viewing changes to import_dsc.py

  • Committer: James Westby
  • Date: 2009-07-26 16:58:03 UTC
  • mfrom: (356.2.1 trunk)
  • Revision ID: james.westby@canonical.com-20090726165803-wovoov9bfimfsz5f
Fix the error when the upstream tag is missing during merge-upstream.

The error now tells the user more reliably what version is being used and
what tag is being searched for.

Show diffs side-by-side

added added

removed removed

Lines of Context:
import_dsc.py
1650
1650
                else:
1651
1651
                    raise BzrCommandError("Unable to find the tag for the "
1652
1652
                            "previous upstream version, %s, in the branch: "
1653
 
                            "%s" % (previous_version,
1654
 
                                self.upstream_tag_name(previous_version)))
 
1653
                            "%s" % (
 
1654
                        previous_version.upstream_version,
 
1655
                        self.upstream_tag_name(
 
1656
                            previous_version.upstream_version)))
1655
1657
            else:
1656
1658
                self._create_empty_upstream_tree(tempdir)
1657
1659
            if self.has_upstream_version_in_packaging_branch(version.upstream_version):