mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
a27ca6da59
commit
007c284cb8
@@ -418,11 +418,15 @@ class RpmPkgsList(PkgsList):
|
||||
|
||||
# Populate deps dictionary for better manipulation
|
||||
for line in dependencies.splitlines():
|
||||
pkg, dep = line.split("|")
|
||||
if not pkg in deps:
|
||||
deps[pkg] = list()
|
||||
if not dep in deps[pkg]:
|
||||
deps[pkg].append(dep)
|
||||
try:
|
||||
pkg, dep = line.split("|")
|
||||
if not pkg in deps:
|
||||
deps[pkg] = list()
|
||||
if not dep in deps[pkg]:
|
||||
deps[pkg].append(dep)
|
||||
except:
|
||||
# Ignore any other lines they're debug or errors
|
||||
pass
|
||||
|
||||
for line in tmp_output.split('\n'):
|
||||
if len(line.strip()) == 0:
|
||||
|
||||
Reference in New Issue
Block a user