diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-11-26 13:04:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-11-26 13:04:12 +0000 |
| commit | 1c6da2eecdff9ff914467542998cc2a059ed19f3 (patch) | |
| tree | 4be30ccc207a7f87082d15ef428774cf02c27f2f | |
| parent | 4619347bb8f76611d3f4530def4a8ff38d43a0bf (diff) | |
| parent | 007156c3472e18fdea5d538545b9e9b42810ddfe (diff) | |
| download | pbr-1c6da2eecdff9ff914467542998cc2a059ed19f3.tar.gz | |
Merge "Communicate to user when we skip a requirement"
| -rw-r--r-- | pbr/packaging.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py index ced7914..c6d6847 100644 --- a/pbr/packaging.py +++ b/pbr/packaging.py @@ -159,24 +159,26 @@ def parse_requirements(requirements_files=None): # -e git://github.com/openstack/nova/master#egg=nova # -e git://github.com/openstack/nova/master#egg=nova-1.2.3 if re.match(r'\s*-e\s+', line): - requirements.append(re.sub(r'\s*-e\s+.*#egg=(.*)$', - egg_fragment, - line)) + line = re.sub(r'\s*-e\s+.*#egg=(.*)$', egg_fragment, line) # such as: # http://github.com/openstack/nova/zipball/master#egg=nova # http://github.com/openstack/nova/zipball/master#egg=nova-1.2.3 elif re.match(r'\s*https?:', line): - requirements.append(re.sub(r'\s*https?:.*#egg=(.*)$', - egg_fragment, - line)) + line = re.sub(r'\s*https?:.*#egg=(.*)$', egg_fragment, line) # -f lines are for index locations, and don't get used here elif re.match(r'\s*-f\s+', line): - pass + line = None + reason = 'Index Location' elif (project_name and project_name in BROKEN_ON_27 and sys.version_info >= (2, 7)): - pass - else: + line = None + reason = 'Python 2.6 only dependency' + + if line is not None: requirements.append(line) + else: + log.info( + '[pbr] Excluding %s: %s' % (project_name, reason)) return requirements |