~cloud-init-dev/cloud-init/trunk

« back to all changes in this revision

Viewing changes to packages/brpm

  • Committer: Joshua Harlow
  • Date: 2016-07-15 18:48:25 UTC
  • mto: This revision was merged to the branch mainline in revision 1257.
  • Revision ID: harlowja@gmail.com-20160715184825-wgeercu42gwa45af
Avoid depending on argparse in 2.7 or greater

Its not needed since its a built-in for these
versions so we can just skip it for any newer
rpm building in the first place.

Show diffs side-by-side

added added

removed removed

Lines of Context:
137
137
    # Map to known packages
138
138
    requires = []
139
139
    for p in pkgs:
 
140
        if p == 'argparse' and sys.version_info[0:2] >= (2, 7):
 
141
            # Not needed on anything but 2.6 or older.
 
142
            continue
140
143
        tgt_pkg = PKG_MP[args.distro].get(p)
141
144
        if not tgt_pkg:
142
145
            raise RuntimeError(("Do not know how to translate pypi dependency"