Merge lp:~wgrant/bzr-builder/bug-1242796 into lp:bzr-builder

[William Grant]

Fix --no-build to leave a PACKAGE-VERSION directory rather than a TEMPLATE directory, returning to the 0.7.2 behaviour.

Fix --no-build to leave a PACKAGE-VERSION directory rather than a TEMPLATE directory. This regressed in r158. It technically breaks compatibility with 0.7.3 by returning to the 0.7.2 behaviour, but I doubt anything actually wants the broken 0.7.3 behaviour

21:51:45 < jelmer> oh, right
21:51:50 < jelmer> yeah, that's not intentional

[Jelmer Vernooij (jelmer)]

On Wed, Aug 06, 2014 at 12:17:23PM -0000, William Grant wrote:
> William Grant has proposed merging lp:~wgrant/bzr-builder/bug-1242796 into lp:bzr-builder with lp:~wgrant/bzr-builder/bug-1350430 as a prerequisite.
>
> Commit message:
> Fix --no-build to leave a PACKAGE-VERSION directory rather than a TEMPLATE directory, returning to the 0.7.2 behaviour.
>
> Requested reviews:
> bzr-builder developers (bzr-builder-devs)
> Related bugs:
> Bug #1242796 in bzr-builder: "Fix destdir for recipe"
> https://bugs.launchpad.net/bzr-builder/+bug/1242796
>
> For more details, see:
> https://code.launchpad.net/~wgrant/bzr-builder/bug-1242796/+merge/229772
>
> Fix --no-build to leave a PACKAGE-VERSION directory rather than a TEMPLATE directory. This regressed in r158. It technically breaks compatibility with 0.7.3 by returning to the 0.7.2 behaviour, but I doubt anything actually wants the broken 0.7.3 behaviour
>
> 21:51:45 < jelmer> oh, right
> 21:51:50 < jelmer> yeah, that's not intentional

Fix LGTM.

Jelmer

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-12-15 17:26:04 +0000
+++ cmds.py	2014-08-06 12:18:22 +0000
@@ -412,9 +412,11 @@
                     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.
-                os.rename(package_dir, working_directory)
+                if not no_build:
+                    # package_dir -> working_directory
+                    # FIXME: may fail in error unwind, masking the
+                    # original exception.
+                    os.rename(package_dir, working_directory)
             # Note that this may write a second manifest.
             if manifest is not None:
                 write_manifest_to_transport(manifest, base_branch,
 
=== modified file 'tests/test_blackbox.py'
--- tests/test_blackbox.py	2014-08-06 12:18:22 +0000
+++ tests/test_blackbox.py	2014-08-06 12:18:22 +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/test-1/debian/changelog")
+            "working/package-1/debian/changelog")
         self.assertStartsWith(actual_cl_contents, new_cl_contents)
         for fn in os.listdir("working"):
             self.assertFalse(fn.endswith(".changes"))