diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-11-29 15:33:36 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:31:06 +0000 |
| commit | 81dded6e9565734c7afe8b8dd89617305ab69bb0 (patch) | |
| tree | 54aaeb14732c9f40c1bab6fc30e2931e37d46f5f /meta/recipes-devtools/python/python-smartpm | |
| parent | e60be76f431dd3bf2ec57ea0271ac97c327fa95c (diff) | |
| download | ast2050-yocto-poky-81dded6e9565734c7afe8b8dd89617305ab69bb0.zip ast2050-yocto-poky-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/python-smartpm')
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-rpm-md-parse.patch | 26 |
1 files changed, 26 insertions, 0 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@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 + |
