x/anvil
Code Issues Proposed changes

Handle rpm name versions correctly.

Browse Source 
Ensure that we cut off the python -> rpm name
versions correctly and don't put duplicate names
into the returned array.

Change-Id: I4767ed815ecbfcfb4756c751be2b2e5ccd0deb40
This commit is contained in:
Joshua Harlow 2013-06-30 12:17:02 -07:00
parent b504addad5
commit ddaea63ffe
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
anvil/packaging/yum.py
View File

@ -547,12 +547,17 @@ class YumDependencyHandler(base.DependencyHandler):
return []
cmdline = self.py2rpm_start_cmdline() + ["--convert"] + python_names
rpm_names = []
for name in sh.execute(cmdline)[0].splitlines():
# name is "Requires: rpm-name"
try:
rpm_names.append(name.split(":", 1)[1].strip())
except IndexError:
pass
for line in sh.execute(cmdline)[0].splitlines():
# format is "Requires: rpm-name <=> X"
if not line.startswith("Requires:"):
continue
line = line[len("Requires:"):].strip()
positions = [line.find(">"), line.find("<"), line.find("=")]
positions = sorted([p for p in positions if p != -1])
if positions:
line = line[0:positions[0]].strip()
if line and line not in rpm_names:
rpm_names.append(line)
return rpm_names
def _all_rpm_names(self):