cloud-init

Merge lp:~harlowja/cloud-init/cloud-init-fix-rpm-argparse into lp:~cloud-init-dev/cloud-init/trunk

  1. cloud-init-fix-rpm-argparse
  2. Merge into trunk
Proposed by Joshua Harlow
Status: Merged
Merged at revision: 1257
Proposed branch: lp:~harlowja/cloud-init/cloud-init-fix-rpm-argparse
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 13 lines (+3/-0)
1 file modified
packages/brpm (+3/-0)
To merge this branch: bzr merge lp:~harlowja/cloud-init/cloud-init-fix-rpm-argparse
Reviewer Review Type Date Requested Status
Scott Moser Approve
Review via email: mp+300235@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'packages/brpm'
2--- packages/brpm 2015-05-19 12:16:46 +0000
3+++ packages/brpm 2016-07-15 18:49:45 +0000
4@@ -137,6 +137,9 @@
5 # Map to known packages
6 requires = []
7 for p in pkgs:
8+ if p == 'argparse' and sys.version_info[0:2] >= (2, 7):
9+ # Not needed on anything but 2.6 or older.
10+ continue
11 tgt_pkg = PKG_MP[args.distro].get(p)
12 if not tgt_pkg:
13 raise RuntimeError(("Do not know how to translate pypi dependency"