summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-11-28 17:38:12 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:30:33 +0000
commit81f8972323a0a89e67f5cc4be247bc8e1b637cc4 (patch)
treee347724393917700eb09469b72d1ae0eaa4104dd /meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch
parent0564f7bbe8e06868e107b70d5abbf3dd6c113bad (diff)
downloadopenembedded-core-81f8972323a0a89e67f5cc4be247bc8e1b637cc4.tar.gz
openembedded-core-81f8972323a0a89e67f5cc4be247bc8e1b637cc4.tar.bz2
openembedded-core-81f8972323a0a89e67f5cc4be247bc8e1b637cc4.zip
python-smartpm: Fix incorrect comparison arguments
Built-in provides were not being compared properly within smart. This was caused by an incorrect argument to the match function. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch')
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch b/meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch
new file mode 100644
index 0000000000..d06f416605
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch
@@ -0,0 +1,28 @@
+smart - backends/rmp/metadata.py: Fix incorrect call to the match function
+
+The match function should take three parameters, name, comparison, version...
+The original code was passing it a reference to the object holding the data
+instead, which caused the comparison in match to always fail.
+
+Upstream-Status: Pending
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+--- a/smart/backends/rpm/metadata.py
++++ b/smart/backends/rpm/metadata.py
+@@ -332,13 +332,13 @@
+ reqargs = [x for x in reqdict
+ if not ((x[2] is None or "=" in x[2]) and
+ (RPMProvides, x[1], x[3]) in prvdict or
+- system_provides.match(*x[:3]))]
++ system_provides.match(x[1], x[2], x[3]))]
+ reqargs = collapse_libc_requires(reqargs)
+
+ recargs = [x for x in recdict
+ if not ((x[2] is None or "=" in x[2]) and
+ (RPMProvides, x[1], x[3]) in prvdict or
+- system_provides.match(*x[:3]))]
++ system_provides.match(x[1], x[2], x[3]))]
+
+ prvargs = prvdict.keys()
+ cnfargs = cnfdict.keys()