Merge lp:~jelmer/bzr-builder/fix-upstream-tarball-no-build into lp:bzr-builder

[Jelmer Vernooij]

Fix exporting of upstream tarball when --no-build is specified.

Rather than returning early, this simply makes --no-build skip the build step. This makes the code a bit more predictable, and makes it actually export the upstream tarball with --no-build, rather than exiting before it got to that step.

[lp:~jelmer/bzr-builder/fix-upstream-tarball-no-build]

158. By Jelmer Vernooij on 2011-11-10

Fix test.

Unmerged revisions

=== modified file '__init__.py'
--- __init__.py	2011-07-20 09:42:32 +0000
+++ __init__.py	2011-11-10 18:15:27 +0000
@@ -145,6 +145,16 @@
         resulting tree
 """
 
+from info import (
+    bzr_plugin_version as version_info,
+    )
+
+if version_info[3] == 'final':
+    version_string = '%d.%d.%d' % version_info[:3]
+else:
+    version_string = '%d.%d.%d%s%d' % version_info
+__version__ = version_string
+
 if __name__ == '__main__':
     import os
     import subprocess

=== modified file 'cmds.py'
--- cmds.py	2011-11-10 13:19:57 +0000
+++ cmds.py	2011-11-10 18:15:27 +0000
@@ -671,33 +671,29 @@
                 working_basedir)
             # working_directory -> package_dir: after this debian stuff works.
             os.rename(working_directory, package_dir)
-            if no_build:
-                if manifest is not None:
-                    write_manifest_to_transport(manifest, base_branch,
-                        possible_transports)
-                return 0
-            current_format = get_source_format(package_dir)
-            if (package_version.debian_version is not None or
-                current_format == "3.0 (quilt)"):
-                # Non-native package
-                try:
-                    extract_upstream_tarball(base_branch.branch, package_name,
-                        package_version.upstream_version, working_basedir)
-                except errors.NoSuchTag, e:
-                    if not allow_fallback_to_native:
-                        raise errors.BzrCommandError(
-                            "Unable to find the upstream source. Import it "
-                            "as tag %s or build with "
-                            "--allow-fallback-to-native." % e.tag_name)
-                    else:
-                        force_native_format(package_dir, current_format)
             try:
-                build_source_package(package_dir,
-                        tgz_check=not allow_fallback_to_native)
-                if key_id is not None:
-                    sign_source_package(package_dir, key_id)
-                if dput is not None:
-                    dput_source_package(package_dir, dput)
+                current_format = get_source_format(package_dir)
+                if (package_version.debian_version is not None or
+                    current_format == "3.0 (quilt)"):
+                    # Non-native package
+                    try:
+                        extract_upstream_tarball(base_branch.branch, package_name,
+                            package_version.upstream_version, working_basedir)
+                    except errors.NoSuchTag, e:
+                        if not allow_fallback_to_native:
+                            raise errors.BzrCommandError(
+                                "Unable to find the upstream source. Import it "
+                                "as tag %s or build with "
+                                "--allow-fallback-to-native." % e.tag_name)
+                        else:
+                            force_native_format(package_dir, current_format)
+                if not no_build:
+                    build_source_package(package_dir,
+                            tgz_check=not allow_fallback_to_native)
+                    if key_id is not None:
+                        sign_source_package(package_dir, key_id)
+                    if dput is not None:
+                        dput_source_package(package_dir, dput)
             finally:
                 # package_dir -> working_directory
                 # FIXME: may fail in error unwind, masking the original exception.

=== added file 'info.py'
--- info.py	1970-01-01 00:00:00 +0000
+++ info.py	2011-11-10 18:15:27 +0000
@@ -0,0 +1,17 @@
+# bzr-builder: a bzr plugin to constuct trees based on recipes
+# Copyright 2011 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# PURPOSE.  See the GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along 
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+bzr_plugin_version = (0, 7, 2, 'dev', 0)

=== modified file 'setup.py'
--- setup.py	2011-11-10 13:24:30 +0000
+++ setup.py	2011-11-10 18:15:27 +0000
@@ -1,10 +1,15 @@
 #!/usr/bin/python
 
+from info import *
+
 from distutils.core import setup
 
 if __name__ == '__main__':
+    version = bzr_plugin_version[:3]
+    version_string = ".".join([str(x) for x in version])
+
     setup(name="bzr-builder",
-          version="0.7.2",
+          version=version_string,
           description="Turn a recipe in to a bzr branch",
           author="James Westby",
           author_email="[e-mail]",

=== modified file 'tests/test_blackbox.py'
--- tests/test_blackbox.py	2011-11-10 00:55:33 +0000
+++ tests/test_blackbox.py	2011-11-10 18:15:27 +0000
@@ -359,7 +359,7 @@
         new_cl_contents = ("package (1) unstable; urgency=low\n\n"
                 "  * Auto build.\n\n -- M. Maintainer <[e-mail]>  ")
         actual_cl_contents = self._get_file_contents(
-            "working/package-1/debian/changelog")
+            "working/test-1/debian/changelog")
         self.assertStartsWith(actual_cl_contents, new_cl_contents)
         for fn in os.listdir("working"):
             self.assertFalse(fn.endswith(".changes"))