From 9b6bf6a41f630967c92dbc6644542943ff5f2305 Mon Sep 17 00:00:00 2001 From: Alex Franco Date: Wed, 26 Aug 2015 16:57:34 -0500 Subject: Empty image: package list splitting and iteration A few short fixes to splitting/iteration done over package lists in license.bbclass, package_manager.py and rootfs.py. [YOCTO #7664] (From OE-Core rev: a902e98c5938f52ec960e0518e0ceaf8f5ee610c) Signed-off-by: Alex Franco Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 5 +++-- meta/lib/oe/rootfs.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/lib/oe') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 2ab1d78bca..ef917f15b2 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -995,9 +995,10 @@ class RpmPM(PackageManager): ''' def install(self, pkgs, attempt_only=False): - bb.note("Installing the following packages: %s" % ' '.join(pkgs)) - if attempt_only and len(pkgs) == 0: + if not pkgs: + bb.note("There are no packages to install") return + bb.note("Installing the following packages: %s" % ' '.join(pkgs)) pkgs = self._pkg_translate_oe_to_smart(pkgs, attempt_only) if not attempt_only: diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 8c8244c453..c29843b054 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -235,7 +235,7 @@ class Rootfs(object): installed_pkgs_dir = self.d.expand('${WORKDIR}/installed_pkgs.txt') pkgs_to_remove = list() with open(installed_pkgs_dir, "r+") as installed_pkgs: - pkgs_installed = installed_pkgs.read().split('\n') + pkgs_installed = installed_pkgs.read().splitlines() for pkg_installed in pkgs_installed[:]: pkg = pkg_installed.split()[0] if pkg in ["update-rc.d", -- cgit v1.2.3-54-g00ecf