Rev 385: Merge trunk. in http://people.canonical.com/~robertc/baz2.0/plugins/builddeb/trunk

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/plugins/builddeb/trunk

------------------------------------------------------------
revno: 385 [merge]
revision-id: robertc at robertcollins.net-20091125234925-kla85kczq899ahgw
parent: robertc at robertcollins.net-20091123234753-1e6yp0samsrn1z8g
parent: james.westby at canonical.com-20091123220225-ajju02q3z5beotan
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Thu 2009-11-26 10:49:25 +1100
message:
  Merge trunk.
modified:
  cmds.py                        commands.py-20090212140847-xar6smw4yyx06egs-1
  debian/changelog               changelog-20060815213430-chhbjkje3exq7kj6-3
  tests/blackbox/test_mark_uploaded.py test_mark_uploaded.p-20080827115728-9kspm8qwzabebn0s-1
  util.py                        util.py-20060816235838-wk9rk801k2fdaihy-4
=== modified file 'cmds.py'
--- a/cmds.py	2009-11-12 03:04:50 +0000
+++ b/cmds.py	2009-11-25 23:49:25 +0000
@@ -87,7 +87,6 @@
         lookup_distribution,
         open_file,
         open_file_via_transport,
-        suite_to_distribution,
         tarball_name,
         )
 
@@ -426,8 +425,11 @@
                         'dpkg-architecture -qDEB_BUILD_ARCH')
                     if status > 0:
                         raise BzrCommandError("Could not find the build architecture")
+                non_epoch_version = changelog.version.upstream_version
+                if changelog.version.debian_version is not None:
+                    non_epoch_version += "-%s" % changelog.version.debian_version
                 changes = "%s_%s_%s.changes" % (changelog.package,
-                        str(changelog.version), arch)
+                        non_epoch_version, arch)
                 changes_path = os.path.join(build_dir, changes)
                 if not os.path.exists(changes_path):
                     if result_dir is not None:
@@ -729,7 +731,7 @@
                         raise BzrCommandError("Unable to find the tag for "
                                 "the previous upstream version, %s, in the "
                                 "branch: %s" % (last_version,
-                                    db.upstream_tag_name(str(last_version))))
+                                    db.upstream_tag_name(last_version.upstream_version)))
                     upstream_tip = db.revid_of_upstream_version_from_branch(
                             last_version.upstream_version)
                     db.extract_upstream_tree(upstream_tip, tempdir)
@@ -861,12 +863,11 @@
             if not merge:
                 merge = config.merge
             (changelog, larstiq) = find_changelog(t, merge)
-            distributions = changelog.distributions.strip()
-            target_dist = distributions.split()[0]
-            distribution_name = suite_to_distribution(target_dist)
-            if distribution_name is None:
-                raise BzrCommandError("Unknown target distribution: %s" \
-                        % target_dist)
+            if changelog.distributions == 'UNRELEASED':
+                if not force:
+                    raise BzrCommandError("The changelog still targets "
+                            "'UNRELEASED', so apparently hasn't been "
+                            "uploaded.")
             db = DistributionBranch(t.branch, None)
             dbs = DistributionBranchSet()
             dbs.add_branch(db)

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-09-14 19:23:30 +0000
+++ b/debian/changelog	2009-09-22 18:44:59 +0000
@@ -1,4 +1,10 @@
-bzr-builddeb (2.2~ubuntu3) UNRELEASED; urgency=low
+bzr-builddeb (2.2~ubuntu4) UNRELEASED; urgency=low
+
+  * 
+
+ -- James Westby <james.westby at ubuntu.com>  Tue, 22 Sep 2009 19:44:46 +0100
+
+bzr-builddeb (2.2~ubuntu3) karmic; urgency=low
 
   [ Jelmer Vernooij ]
   * Automatically use merge mode if there's only a debian/ directory in

=== modified file 'tests/blackbox/test_mark_uploaded.py'
--- a/tests/blackbox/test_mark_uploaded.py	2009-02-17 16:47:07 +0000
+++ b/tests/blackbox/test_mark_uploaded.py	2009-11-23 22:02:25 +0000
@@ -78,8 +78,8 @@
         finally:
             f.close()
         self.wt.commit("two")
-        self.run_bzr_error(["Unknown target distribution: UNRELEASED"],
-                "mark-uploaded")
+        self.run_bzr_error(["The changelog still targets 'UNRELEASED', so "
+                "apparently hasn't been uploaded."], "mark-uploaded")
 
     def test_mark_uploaded_already(self):
         self.make_unuploaded()

=== modified file 'util.py'
--- a/util.py	2009-09-16 14:42:03 +0000
+++ b/util.py	2009-11-23 22:02:25 +0000
@@ -210,10 +210,11 @@
     :return: "debian", "ubuntu", or None if the distribution couldn't be inferred.
     """
     debian_releases = ('woody', 'sarge', 'etch', 'lenny', 'squeeze', 'stable',
-            'testing', 'unstable', 'experimental', 'frozen')
+            'testing', 'unstable', 'experimental', 'frozen', 'sid')
     debian_targets = ('', '-security', '-proposed-updates', '-backports')
     ubuntu_releases = ('warty', 'hoary', 'breezy', 'dapper', 'edgy',
-            'feisty', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic')
+            'feisty', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic',
+            'lucid')
     ubuntu_targets = ('', '-proposed', '-updates', '-security', '-backports')
     all_debian = [r + t for r in debian_releases for t in debian_targets]
     all_ubuntu = [r + t for r in ubuntu_releases for t in ubuntu_targets]