summaryrefslogtreecommitdiffstats
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:03 +0100
commit1849ce3bd7c0af055f3e849a6508e746b6a0dca5 (patch)
tree9966c20af4dd41317927de72169e0fe7998ef077
parent1e0cf88f6aecb0b523f7ef016fcd95d25a10e066 (diff)
downloadopenembedded-core-contrib-1849ce3bd7c0af055f3e849a6508e746b6a0dca5.tar.gz
openembedded-core-contrib-1849ce3bd7c0af055f3e849a6508e746b6a0dca5.tar.bz2
openembedded-core-contrib-1849ce3bd7c0af055f3e849a6508e746b6a0dca5.zip
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. Signed-off-by: Richard Röjfors <richard@puffinpack.se> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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):
output = self._invoke_dnf((["--skip-broken"] if attempt_only else []) +
(["-x", ",".join(exclude_pkgs)] if len(exclude_pkgs) > 0 else []) +
- (["--setopt=install_weak_deps=False"] if self.d.getVar('NO_RECOMMENDATIONS') == 1 else []) +
+ (["--setopt=install_weak_deps=False"] if self.d.getVar('NO_RECOMMENDATIONS') == "1" else []) +
(["--nogpgcheck"] if self.d.getVar('RPM_SIGN_PACKAGES') != '1' else ["--setopt=gpgcheck=True"]) +
["install"] +
pkgs)