summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/package_manager.py
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-02-23 11:28:21 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 17:00:27 +0000
commit007c284cb83cf5d98f3e4f605244ca6f1d46caea (patch)
tree32efe1a38e908bdc64ac59cad5f7b5e6b2d99ecf /meta/lib/oe/package_manager.py
parenta27ca6da59e6939a5bbab641236f7f792c03694f (diff)
downloadpoky-007c284cb83cf5d98f3e4f605244ca6f1d46caea.tar.gz
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any diagnostic messages are ignored from the output of rpmresolve. The patches have been split into bug fixes (things that belong upstream) and local changes that are OE specific. The following patches are obsolete and have been removed: rpm-remove-sykcparse-decl.patch fstack-protector-configure-check.patch rpm-disable-Wno-override-init.patch rpm-lua-fix-print.patch rpm-rpmpgp-fix.patch verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch (From OE-Core rev: ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package_manager.py')
-rw-r--r--meta/lib/oe/package_manager.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 5cd43e9b1d..b701b8c51b 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -418,11 +418,15 @@ class RpmPkgsList(PkgsList):
418 418
419 # Populate deps dictionary for better manipulation 419 # Populate deps dictionary for better manipulation
420 for line in dependencies.splitlines(): 420 for line in dependencies.splitlines():
421 pkg, dep = line.split("|") 421 try:
422 if not pkg in deps: 422 pkg, dep = line.split("|")
423 deps[pkg] = list() 423 if not pkg in deps:
424 if not dep in deps[pkg]: 424 deps[pkg] = list()
425 deps[pkg].append(dep) 425 if not dep in deps[pkg]:
426 deps[pkg].append(dep)
427 except:
428 # Ignore any other lines they're debug or errors
429 pass
426 430
427 for line in tmp_output.split('\n'): 431 for line in tmp_output.split('\n'):
428 if len(line.strip()) == 0: 432 if len(line.strip()) == 0: