python-smartpm: fix package metadata not being read from rpm-md feeds

The XML indexes in rpm-md were being parsed incorrectly leading to the
package metadata (e.g. dependencies) not being read.

(From OE-Core rev: bb3abe241ae9d7e62e084cde383ebe1c6b95d825)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2012-11-29 15:33:36 +00:00 committed by Richard Purdie
parent e60be76f43
commit 81dded6e95
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,26 @@
backends/rpm: fix parsing of rpm-md metadata
If assertions are disabled then the queue.pop() wasn't being executed,
leading to requires, recommends etc. not being read properly.
Upstream-Status: Pending
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
diff --git a/smart/backends/rpm/metadata.py b/smart/backends/rpm/metadata.py
index 2c54f39..dc9df22 100644
--- a/smart/backends/rpm/metadata.py
+++ b/smart/backends/rpm/metadata.py
@@ -188,7 +188,8 @@ class RPMMetaDataLoader(Loader):
elif event == "end":
- assert queue.pop() is elem
+ popped = queue.pop()
+ assert popped is elem
if skip:
if tag == skip:
--
1.7.9.5

View File

@ -11,7 +11,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
DEPENDS = "python rpm"
PR = "r1"
PR = "r2"
SRCNAME = "smart"
SRC_URI = "\
@ -19,6 +19,7 @@ SRC_URI = "\
file://smartpm-rpm5-nodig.patch \
file://smart-rpm-root.patch \
file://smart-recommends.patch \
file://smart-rpm-md-parse.patch \
"
SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"