Merge lp://staging/~smoser/maas-images/trunk.meph-import-out into lp://staging/maas-images

Proposed by Scott Moser
Status: Merged
Merged at revision: 333
Proposed branch: lp://staging/~smoser/maas-images/trunk.meph-import-out
Merge into: lp://staging/maas-images
Diff against target: 1036 lines (+504/-421)
5 files modified
bin/meph2-import (+27/-0)
meph2/commands/flags.py (+107/-0)
meph2/commands/meph2_util.py (+25/-421)
meph2/commands/mimport.py (+306/-0)
meph2/util.py (+39/-0)
To merge this branch: bzr merge lp://staging/~smoser/maas-images/trunk.meph-import-out
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
Review via email: mp+306776@code.staging.launchpad.net
To post a comment you must log in.
334. By Scott Moser

fix usage of contentsource

Revision history for this message
Lee Trager (ltrager) wrote :

Looks good, things were just moved around a bit. One thing I noticed when I checked this out is meph2-import doesn't have the executable bit set.

review: Approve
335. By Scott Moser

add -x to bin/meph2-import

Revision history for this message
Scott Moser (smoser) wrote :

fixed the meph2-import executable. that was fallout of just bzr diff | patch -p0
and such.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches