summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-11-29 15:33:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:06 +0000
commit81dded6e9565734c7afe8b8dd89617305ab69bb0 (patch)
tree54aaeb14732c9f40c1bab6fc30e2931e37d46f5f /meta/recipes-devtools/python
parente60be76f431dd3bf2ec57ea0271ac97c327fa95c (diff)
downloadpoky-81dded6e9565734c7afe8b8dd89617305ab69bb0.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-rpm-md-parse.patch26
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb3
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 0000000000..97cecc124d
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-rpm-md-parse.patch
@@ -0,0 +1,26 @@
1backends/rpm: fix parsing of rpm-md metadata
2
3If assertions are disabled then the queue.pop() wasn't being executed,
4leading to requires, recommends etc. not being read properly.
5
6Upstream-Status: Pending
7
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9
10diff --git a/smart/backends/rpm/metadata.py b/smart/backends/rpm/metadata.py
11index 2c54f39..dc9df22 100644
12--- a/smart/backends/rpm/metadata.py
13+++ b/smart/backends/rpm/metadata.py
14@@ -188,7 +188,8 @@ class RPMMetaDataLoader(Loader):
15
16 elif event == "end":
17
18- assert queue.pop() is elem
19+ popped = queue.pop()
20+ assert popped is elem
21
22 if skip:
23 if tag == skip:
24--
251.7.9.5
26
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 ff153a77d0..2d0f7cd641 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"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
12 12
13DEPENDS = "python rpm" 13DEPENDS = "python rpm"
14PR = "r1" 14PR = "r2"
15SRCNAME = "smart" 15SRCNAME = "smart"
16 16
17SRC_URI = "\ 17SRC_URI = "\
@@ -19,6 +19,7 @@ SRC_URI = "\
19 file://smartpm-rpm5-nodig.patch \ 19 file://smartpm-rpm5-nodig.patch \
20 file://smart-rpm-root.patch \ 20 file://smart-rpm-root.patch \
21 file://smart-recommends.patch \ 21 file://smart-recommends.patch \
22 file://smart-rpm-md-parse.patch \
22 " 23 "
23 24
24SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" 25SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"