summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
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:31:07 +0000
commit2bc0834f85b4a4e449051f916fde8d8b1e65a2da (patch)
treeec337a3f8e61b53ecf4d6f72a805c6f0f00d4e7f /meta/recipes-devtools
parentb3744b7ead92ad618c2e1b5ad5dcda6f85b8f779 (diff)
downloadpoky-2bc0834f85b4a4e449051f916fde8d8b1e65a2da.tar.gz
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. (From OE-Core rev: 81f8972323a0a89e67f5cc4be247bc8e1b637cc4) Signed-off-by: Mark Hatle <mark.hatle@windriver.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')
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch28
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb3
2 files changed, 30 insertions, 1 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 @@
1smart - backends/rmp/metadata.py: Fix incorrect call to the match function
2
3The match function should take three parameters, name, comparison, version...
4The original code was passing it a reference to the object holding the data
5instead, which caused the comparison in match to always fail.
6
7Upstream-Status: Pending
8
9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
10
11--- a/smart/backends/rpm/metadata.py
12+++ b/smart/backends/rpm/metadata.py
13@@ -332,13 +332,13 @@
14 reqargs = [x for x in reqdict
15 if not ((x[2] is None or "=" in x[2]) and
16 (RPMProvides, x[1], x[3]) in prvdict or
17- system_provides.match(*x[:3]))]
18+ system_provides.match(x[1], x[2], x[3]))]
19 reqargs = collapse_libc_requires(reqargs)
20
21 recargs = [x for x in recdict
22 if not ((x[2] is None or "=" in x[2]) and
23 (RPMProvides, x[1], x[3]) in prvdict or
24- system_provides.match(*x[:3]))]
25+ system_provides.match(x[1], x[2], x[3]))]
26
27 prvargs = prvdict.keys()
28 cnfargs = cnfdict.keys()
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 4694d517aa..bbaa530c4a 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 = "r2" 14PR = "r3"
15SRCNAME = "smart" 15SRCNAME = "smart"
16 16
17SRC_URI = "\ 17SRC_URI = "\
@@ -23,6 +23,7 @@ SRC_URI = "\
23 file://smart-dflags.patch \ 23 file://smart-dflags.patch \
24 file://smart-rpm-md-parse.patch \ 24 file://smart-rpm-md-parse.patch \
25 file://smart-tmpdir.patch \ 25 file://smart-tmpdir.patch \
26 file://smart-metadata-match.patch \
26 " 27 "
27 28
28SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" 29SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"