summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Röjfors <richard.rojfors@gmail.com>2017-07-30 11:12:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-09 09:24:16 +0100
commit0a3bb8b8275a37acfacfe9cd76fa726c28c232c8 (patch)
treec341a2201ba261ce3ca6f93d175b47c020f3ebd7 /meta/lib
parent7c3549f91b5aa2953cd4d870eca9e1b7c60d0b7d (diff)
downloadpoky-0a3bb8b8275a37acfacfe9cd76fa726c28c232c8.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: 1849ce3bd7c0af055f3e849a6508e746b6a0dca5) Signed-off-by: Richard Röjfors <richard@puffinpack.se> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 72503eb9d3..518cf8dbe3 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)