[gnome-continuous-yocto/gnomeostree-3.28-rocko: 194/218] package_manager: improve install_complementary

[Emmanuele Bassi <ebassi src gnome org>]

commit 59b982e6b8cf18fa4a301d18cd79eee3bbd76250
Author: Ross Burton <ross burton intel com>
Date:   Thu Mar 1 18:26:29 2018 +0000

    package_manager: improve install_complementary
    
    - No need to use bb.utils.which() as subprocess will search $PATH
    - Clarity flow by moving the install inside the try/except
    
    (From OE-Core rev: f4d22b7195dd8f08fe26dd353c7e860208e87d6a)
    
    (From OE-Core rev: 92a0359b1e2558b175374a81a1d6146724cd1a9e)
    
    (From OE-Core rev: 409e2e8c2b8f99d6f3d5930047f29649a1e62888)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/package_manager.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index bd6dc99..4b7163e 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -402,7 +402,7 @@ class PackageManager(object, metaclass=ABCMeta):
             installed_pkgs.write(output)
             installed_pkgs.flush()
 
-            cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"),
+            cmd = ["oe-pkgdata-util",
                    "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name,
                    globs]
             exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY')
@@ -412,11 +412,11 @@ class PackageManager(object, metaclass=ABCMeta):
                 bb.note("Installing complementary packages ...")
                 bb.note('Running %s' % cmd)
                 complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8")
+                self.install(complementary_pkgs.split(), attempt_only=True)
             except subprocess.CalledProcessError as e:
                 bb.fatal("Could not compute complementary packages list. Command "
                          "'%s' returned %d:\n%s" %
                          (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
-            self.install(complementary_pkgs.split(), attempt_only=True)
 
     def deploy_dir_lock(self):
         if self.deploy_dir is None: