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

Proposed by William Grant on 2014-08-06
Status: Merged
Merged at revision: 174
Proposed branch: lp:~wgrant/bzr-builder/bug-1242796
Merge into: lp:bzr-builder
Prerequisite: lp:~wgrant/bzr-builder/bug-1350430
Diff against target: 31 lines (+6/-4)
2 files modified
cmds.py (+5/-3)
tests/test_blackbox.py (+1/-1)
To merge this branch: bzr merge lp:~wgrant/bzr-builder/bug-1242796
Reviewer Review Type Date Requested Status
Colin Watson (community) 2014-08-06 Approve on 2014-08-06
bzr-builder developers 2014-08-06 Pending
Review via email: mp+229772@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmds.py'
2--- cmds.py 2011-12-15 17:26:04 +0000
3+++ cmds.py 2014-08-06 12:18:22 +0000
4@@ -412,9 +412,11 @@
5 if dput is not None:
6 dput_source_package(package_dir, dput)
7 finally:
8- # package_dir -> working_directory
9- # FIXME: may fail in error unwind, masking the original exception.
10- os.rename(package_dir, working_directory)
11+ if not no_build:
12+ # package_dir -> working_directory
13+ # FIXME: may fail in error unwind, masking the
14+ # original exception.
15+ os.rename(package_dir, working_directory)
16 # Note that this may write a second manifest.
17 if manifest is not None:
18 write_manifest_to_transport(manifest, base_branch,
19
20=== modified file 'tests/test_blackbox.py'
21--- tests/test_blackbox.py 2014-08-06 12:18:22 +0000
22+++ tests/test_blackbox.py 2014-08-06 12:18:22 +0000
23@@ -359,7 +359,7 @@
24 new_cl_contents = ("package (1) unstable; urgency=low\n\n"
25 " * Auto build.\n\n -- M. Maintainer <maint@maint.org> ")
26 actual_cl_contents = self._get_file_contents(
27- "working/test-1/debian/changelog")
28+ "working/package-1/debian/changelog")
29 self.assertStartsWith(actual_cl_contents, new_cl_contents)
30 for fn in os.listdir("working"):
31 self.assertFalse(fn.endswith(".changes"))

Subscribers

People subscribed via source and target branches