[oe-commits] Paul Eggleton : python-smartpm: fix package metadata not being read from rpm-md feeds
git at git.openembedded.org
git at git.openembedded.org
Thu Dec 6 12:34:33 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: bb3abe241ae9d7e62e084cde383ebe1c6b95d825
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bb3abe241ae9d7e62e084cde383ebe1c6b95d825
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Thu Nov 29 15:33:36 2012 +0000
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.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
.../python/python-smartpm/smart-rpm-md-parse.patch | 26 ++++++++++++++++++++
.../python/python-smartpm_1.4.1.bb | 3 +-
2 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-rpm-md-parse.patch b/meta/recipes-devtools/python/python-smartpm/smart-rpm-md-parse.patch
new file mode 100644
index 0000000..97cecc1
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-rpm-md-parse.patch
@@ -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 at 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
+
diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
index ff153a7..2d0f7cd 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -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"
More information about the Openembedded-commits
mailing list