]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_manager: fix "exlcude" vs. "exclude" typo
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 16 Mar 2017 15:20:58 +0000 (11:20 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 17 Mar 2017 15:37:04 +0000 (15:37 +0000)
Which results in:

 --------------------------------
      0557:        package_exclude = self.d.getVar('PACKAGE_EXCLUDE')
  *** 0558:        exclude_pkgs = (bad_recommendations.split() if bad_recommendations else []) + (package_exlcude.split() if package_exclude else [])
      0559:
      0560:        output = self._invoke_dnf((["--skip-broken"] if attempt_only else []) +
      0561:                         (["-x", ",".join(exclude_pkgs)] if len(exclude_pkgs) > 0 else []) +
      0562:                         (["--setopt=install_weak_deps=False"] if self.d.getVar('NO_RECOMMENDATIONS') == 1 else []) +
 Exception: NameError: name 'package_exlcude' is not defined
 ERROR: cube-builder-initramfs-1.0-r0 do_rootfs: Function failed: do_rootfs
 ---------------------------------

Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/package_manager.py

index ae6849bce3fcce9fcc70690c279812f362115d5d..2a4df619982d7a4d5935f9d46ebf74b035562d55 100644 (file)
@@ -572,7 +572,7 @@ class RpmPM(PackageManager):
 
         bad_recommendations = self.d.getVar('BAD_RECOMMENDATIONS')
         package_exclude = self.d.getVar('PACKAGE_EXCLUDE')
-        exclude_pkgs = (bad_recommendations.split() if bad_recommendations else []) + (package_exlcude.split() if package_exclude else [])
+        exclude_pkgs = (bad_recommendations.split() if bad_recommendations else []) + (package_exclude.split() if package_exclude else [])
 
         output = self._invoke_dnf((["--skip-broken"] if attempt_only else []) +
                          (["-x", ",".join(exclude_pkgs)] if len(exclude_pkgs) > 0 else []) +