diff options
Diffstat (limited to 'meta/recipes-devtools/python/python-smartpm/smart-missingok.patch')
-rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-missingok.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-missingok.patch b/meta/recipes-devtools/python/python-smartpm/smart-missingok.patch deleted file mode 100644 index 7e138696b8..0000000000 --- a/meta/recipes-devtools/python/python-smartpm/smart-missingok.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | backends/rpm: Identify recommended packages | ||
2 | |||
3 | We identify and store recommended packages (and later throw that data away.) | ||
4 | |||
5 | This is indended to be the starting work to add support for recommended | ||
6 | packages to smart. | ||
7 | |||
8 | Upstream-status: Inappropriate [ Code isn't finished! ] | ||
9 | |||
10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
11 | |||
12 | Index: smart-1.4.1/smart/backends/rpm/header.py | ||
13 | =================================================================== | ||
14 | --- smart-1.4.1.orig/smart/backends/rpm/header.py | ||
15 | +++ smart-1.4.1/smart/backends/rpm/header.py | ||
16 | @@ -292,6 +292,7 @@ class RPMHeaderLoader(Loader): | ||
17 | f = [0] | ||
18 | elif type(f) != list: | ||
19 | f = [f] | ||
20 | + recdict = {} | ||
21 | reqdict = {} | ||
22 | for i in range(len(n)): | ||
23 | ni = n[i] | ||
24 | @@ -308,10 +309,17 @@ class RPMHeaderLoader(Loader): | ||
25 | # RPMSENSE_SCRIPT_PREUN | | ||
26 | # RPMSENSE_SCRIPT_POST | | ||
27 | # RPMSENSE_SCRIPT_POSTUN == 7744 | ||
28 | - reqdict[(f[i]&7744 and PreReq or Req, | ||
29 | - intern(ni), r, vi)] = True | ||
30 | + if (f[i]&rpm.RPMSENSE_MISSINGOK): | ||
31 | + print "Ignoring Recommend Dependency: %s" % (ni) | ||
32 | + recdict[(f[i]&7744 and PreReq or Req, | ||
33 | + intern(ni), r, vi)] = True | ||
34 | + else: | ||
35 | + reqdict[(f[i]&7744 and PreReq or Req, | ||
36 | + intern(ni), r, vi)] = True | ||
37 | + recargs = collapse_libc_requires(recdict.keys()) | ||
38 | reqargs = collapse_libc_requires(reqdict.keys()) | ||
39 | else: | ||
40 | + recargs = None | ||
41 | reqargs = None | ||
42 | |||
43 | n = h[1054] # RPMTAG_CONFLICTNAME | ||