From: Ross Burton <ross.burton@intel.com>
Date: Thu, 15 Dec 2016 17:19:46 +0000 (+0000)
Subject: lib/oe/package_manager: bail if createrepo can't be found
X-Git-Tag: uninative-1.5~1033
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c87361fc886432a9db584712bf3e41ecd0541960;p=openembedded-core.git

lib/oe/package_manager: bail if createrepo can't be found

If createrepo isn't found then the errors later are mysterious, so explicitly
check and error out early if it isn't there.

(From OE-Core rev: e09636bbb3ea8ec58984197fd9c691bb908efe00)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index bb458691e3..e557473999 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -164,7 +164,11 @@ class RpmIndexer(Indexer):
 
         archs = archs.union(set(sdk_pkg_archs))
 
-        rpm_createrepo = bb.utils.which(os.getenv('PATH'), "createrepo")
+        rpm_createrepo = bb.utils.which(os.environ['PATH'], "createrepo")
+        if not rpm_createrepo:
+            bb.error("Cannot rebuild index as createrepo was not found in %s" % os.environ['PATH'])
+            return
+
         if self.d.getVar('PACKAGE_FEED_SIGN') == '1':
             signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND'))
         else: