Merge lp:~jelmer/bzr-builddeb/package-merge-first into lp:bzr-builddeb

[Jelmer Vernooij]

Fix the use of "bzr builddeb --package-merge" if there are no previous uploads.

[lp:~jelmer/bzr-builddeb/package-merge-first]

593. By Jelmer Vernooij on 2011-07-19

use -v0 if there were no previous uploads.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-07-19 15:05:54 +0000
+++ cmds.py	2011-07-19 16:04:35 +0000
@@ -360,14 +360,18 @@
 
             if package_merge:
                 try:
-                    prev_version = find_previous_upload(tree, not contains_upstream_source)
+                    prev_version = find_previous_upload(tree,
+                        not contains_upstream_source)
                 except NoPreviousUpload:
                     prev_version = None
-                build_options.append("-v%s" % str(prev_version))
-                if (prev_version.upstream_version
-                        != changelog.version.upstream_version
-                        or prev_version.epoch != changelog.version.epoch):
-                    build_options.append("-sa")
+                if prev_version is None:
+                    build_options.extend(["-sa", "-v0"])
+                else:
+                    build_options.append("-v%s" % str(prev_version))
+                    if (prev_version.upstream_version != 
+                            changelog.version.upstream_version or
+                        prev_version.epoch != changelog.version.epoch):
+                        build_options.append("-sa")
             build_cmd = self._get_build_command(config, builder, quick,
                     build_options)
             result_dir, build_dir, orig_dir = self._get_dirs(config,

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-19 15:05:54 +0000
+++ debian/changelog	2011-07-19 16:04:35 +0000
@@ -3,8 +3,9 @@
   * Bump standards version to 3.9.2 (no changes).
   * Fix AttributeError in incremental imports using 'bzr import-dsc'.
     LP: #812950
+  * Support --package-merge for the first package version. LP: #812704
 
- -- Jelmer Vernooij <[e-mail]>  Tue, 19 Jul 2011 17:05:38 +0200
+ -- Jelmer Vernooij <[e-mail]>  Tue, 19 Jul 2011 17:35:39 +0200
 
 bzr-builddeb (2.7.5) unstable; urgency=low
 

=== modified file 'tests/blackbox/test_builddeb.py'
--- tests/blackbox/test_builddeb.py	2011-06-13 23:01:14 +0000
+++ tests/blackbox/test_builddeb.py	2011-07-19 16:04:35 +0000
@@ -151,6 +151,11 @@
     self.run_bzr('bd --dont-purge --native --builder "touch built"')
     self.assertInBuildDir('built')
 
+  def test_package_merge_first(self):
+    tree = self.make_unpacked_source()
+    self.make_upstream_tarball()
+    self.run_bzr('bd --package-merge --builder true')
+
   def test_hooks(self):
     tree = self.make_unpacked_source()
     self.make_upstream_tarball()