pkgme

Merge lp:~jml/pkgme/distro-control into lp:pkgme

  1. distro-control
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: James Westby
Approved revision: 81
Merged at revision: 77
Proposed branch: lp:~jml/pkgme/distro-control
Merge into: lp:pkgme
Diff against target: 12 lines (+1/-1)
1 file modified
pkgme/bin/main.py (+1/-1)
To merge this branch: bzr merge lp:~jml/pkgme/distro-control
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+71072@code.launchpad.net

Description of the change

As discussed.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

36 + write_packaging(target_dir, distribution)

(minor) I prefer "distribution=distribution" though I'm not really sure why.

Otherwise this looks ok to me.

I'm not sure that the test for Distribution buys us much as written, but
without mocking the filesystem there's not a whole lot to do, and it's not
particularly fragile.

Thanks,

James

review: Approve
lp:~jml/pkgme/distro-control updated
82. By Jonathan Lange

Stylistic change.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pkgme/bin/main.py'
2--- pkgme/bin/main.py 2011-08-10 15:51:22 +0000
3+++ pkgme/bin/main.py 2011-08-11 08:57:12 +0000
4@@ -18,7 +18,7 @@
5 def build_package(target_dir, interactive, ppa=None, distribution=None):
6 """Where the magic happens."""
7 trace.debug("Building packaging for %s" % (target_dir,))
8- write_packaging(target_dir, distribution)
9+ write_packaging(target_dir, distribution=distribution)
10 trace.debug("Built packaging for %s" % (target_dir,))
11 trace.debug("Building source package for %s" % (target_dir,))
12 changes_file = build_source_package(target_dir, sign=interactive)

Subscribers

People subscribed via source and target branches