diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-11-28 17:38:12 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:31:07 +0000 |
| commit | 2bc0834f85b4a4e449051f916fde8d8b1e65a2da (patch) | |
| tree | ec337a3f8e61b53ecf4d6f72a805c6f0f00d4e7f /meta/recipes-devtools/python/python-smartpm | |
| parent | b3744b7ead92ad618c2e1b5ad5dcda6f85b8f779 (diff) | |
| download | ast2050-yocto-poky-2bc0834f85b4a4e449051f916fde8d8b1e65a2da.zip ast2050-yocto-poky-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/python/python-smartpm')
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch | 28 |
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 0000000..d06f416 --- /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() |
