diff options
author | Richard Röjfors <richard.rojfors@gmail.com> | 2017-07-30 11:12:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-29 11:57:28 +0100 |
commit | 2002de4eae4d1fa6d7187bdd557d6aadd9232205 (patch) | |
tree | 1d01670e29469f303c0c26c93d39acc3baf804f7 /meta/lib | |
parent | 05f79693663096a5329065fbec8bf7762bf9aa96 (diff) | |
download | poky-2002de4eae4d1fa6d7187bdd557d6aadd9232205.tar.gz |
package_manager: Fix support for NO_RECOMMENDATONS
When support for dnf was introduced the check of the
no NO_RECOMMENDATIONS variable got broken.
This fixes the issue by compairing to the string "1"
rather than the number 1.
(From OE-Core rev: 5f9ea84d304a519acb0504516b86f2683a43f9e9)
Signed-off-by: Richard Röjfors <richard@puffinpack.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 1849ce3bd7c0af055f3e849a6508e746b6a0dca5)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/package_manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 93d079d73d..28c6b2aec2 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -585,7 +585,7 @@ class RpmPM(PackageManager): | |||
585 | 585 | ||
586 | output = self._invoke_dnf((["--skip-broken"] if attempt_only else []) + | 586 | output = self._invoke_dnf((["--skip-broken"] if attempt_only else []) + |
587 | (["-x", ",".join(exclude_pkgs)] if len(exclude_pkgs) > 0 else []) + | 587 | (["-x", ",".join(exclude_pkgs)] if len(exclude_pkgs) > 0 else []) + |
588 | (["--setopt=install_weak_deps=False"] if self.d.getVar('NO_RECOMMENDATIONS') == 1 else []) + | 588 | (["--setopt=install_weak_deps=False"] if self.d.getVar('NO_RECOMMENDATIONS') == "1" else []) + |
589 | (["--nogpgcheck"] if self.d.getVar('RPM_SIGN_PACKAGES') != '1' else ["--setopt=gpgcheck=True"]) + | 589 | (["--nogpgcheck"] if self.d.getVar('RPM_SIGN_PACKAGES') != '1' else ["--setopt=gpgcheck=True"]) + |
590 | ["install"] + | 590 | ["install"] + |
591 | pkgs) | 591 | pkgs) |