diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-07-08 00:23:48 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-09 18:00:18 +0100 |
commit | 05b02d27d2115c0af32988bb3b43286f7943471c (patch) | |
tree | 436f4bb3fef2875da1051a41630530b7aeafdae0 /meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch | |
parent | f9ac3f3e200e4fd0dfe0f45ddc606ce945ea0143 (diff) | |
download | poky-05b02d27d2115c0af32988bb3b43286f7943471c.tar.gz |
python-smartpm: 1.4.1 -> 1.5
* Remove the following patches since the are already in the source:
smart-config-ignore-all-recommends.patch
smart-conflict-provider.patch
smart-dflags.patch
smart-filename-NAME_MAX.patch
smart-flag-exclude-packages.patch
smart-flag-ignore-recommends.patch
smart-metadata-match.patch
smart-multilib-fixes.patch
smart-rpm-extra-macros.patch
smart-rpm-md-parse.patch
smart-rpm-root.patch
smart-tmpdir.patch
smart-yaml-error.patch
* Update the following patches, part of the code are already in the
source:
smart-attempt.patch
smart-improve-error-reporting.patch
smart-recommends.patch
smartpm-rpm5-nodig.patch
* Use github and git repo as the SRC_URI.
(From OE-Core rev: 5fc580fc444e45d00de0e50d32b6e6e0b2e6b7ea)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 28 |
1 files changed, 0 insertions, 28 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 deleted file mode 100644 index d06f416605..0000000000 --- a/meta/recipes-devtools/python/python-smartpm/smart-metadata-match.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | smart - backends/rmp/metadata.py: Fix incorrect call to the match function | ||
2 | |||
3 | The match function should take three parameters, name, comparison, version... | ||
4 | The original code was passing it a reference to the object holding the data | ||
5 | instead, which caused the comparison in match to always fail. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-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() | ||