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-flag-ignore-recommends.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-flag-ignore-recommends.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-flag-ignore-recommends.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-flag-ignore-recommends.patch b/meta/recipes-devtools/python/python-smartpm/smart-flag-ignore-recommends.patch deleted file mode 100644 index 5d5c6f4346..0000000000 --- a/meta/recipes-devtools/python/python-smartpm/smart-flag-ignore-recommends.patch +++ /dev/null | |||
| @@ -1,60 +0,0 @@ | |||
| 1 | Add ignore-recommends flag support | ||
| 2 | |||
| 3 | Allow configuring recommends on specific packages to be ignored. | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | |||
| 7 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
| 8 | --- | ||
| 9 | smart/commands/flag.py | 3 +++ | ||
| 10 | smart/transaction.py | 7 ++++++- | ||
| 11 | 2 files changed, 9 insertions(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/smart/commands/flag.py b/smart/commands/flag.py | ||
| 14 | index 8b90496..191bb11 100644 | ||
| 15 | --- a/smart/commands/flag.py | ||
| 16 | +++ b/smart/commands/flag.py | ||
| 17 | @@ -47,6 +47,9 @@ Currently known flags are: | ||
| 18 | multi-version - Flagged packages may have more than one version | ||
| 19 | installed in the system at the same time | ||
| 20 | (backend dependent). | ||
| 21 | + ignore-recommends - Flagged packages will not be installed, if | ||
| 22 | + they are only recommended by a package to be | ||
| 23 | + installed rather than required. | ||
| 24 | |||
| 25 | security - Flagged packages are updates for security errata. | ||
| 26 | bugfix - Flagged packages are updates for bugfix errata. | ||
| 27 | diff --git a/smart/transaction.py b/smart/transaction.py | ||
| 28 | index dd9aa38..38eabae 100644 | ||
| 29 | --- a/smart/transaction.py | ||
| 30 | +++ b/smart/transaction.py | ||
| 31 | @@ -596,12 +596,17 @@ class Transaction(object): | ||
| 32 | # Install packages required by this one. | ||
| 33 | for req in pkg.requires + pkg.recommends: | ||
| 34 | |||
| 35 | + reqrequired = req in pkg.requires | ||
| 36 | + | ||
| 37 | # Check if someone is already providing it. | ||
| 38 | prvpkgs = {} | ||
| 39 | lockedpkgs = {} | ||
| 40 | found = False | ||
| 41 | for prv in req.providedby: | ||
| 42 | for prvpkg in prv.packages: | ||
| 43 | + if not reqrequired: | ||
| 44 | + if pkgconf.testFlag("ignore-recommends", prvpkg): | ||
| 45 | + continue | ||
| 46 | if isinst(prvpkg): | ||
| 47 | found = True | ||
| 48 | break | ||
| 49 | @@ -620,7 +625,7 @@ class Transaction(object): | ||
| 50 | |||
| 51 | if not prvpkgs: | ||
| 52 | # No packages provide it at all. Give up. | ||
| 53 | - if req in pkg.requires: | ||
| 54 | + if reqrequired: | ||
| 55 | reasons = [] | ||
| 56 | for prv in req.providedby: | ||
| 57 | for prvpkg in prv.packages: | ||
| 58 | -- | ||
| 59 | 1.8.1.2 | ||
| 60 | |||
