diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2016-02-23 11:28:21 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 16:59:55 +0000 |
| commit | ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8 (patch) | |
| tree | bf62d871484732f064894b0002fa30353a76b50b /meta/lib | |
| parent | e609c4edb211c576af35b7ac0c190dc9a7673483 (diff) | |
| download | openembedded-core-ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8.tar.gz openembedded-core-ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8.tar.bz2 openembedded-core-ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8.zip | |
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
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 14 |
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): # 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: |