]> code.ossystems Code Review - openembedded-core.git/commitdiff
lib/oe/package_manager: bail if createrepo can't be found
authorRoss Burton <ross.burton@intel.com>
Thu, 15 Dec 2016 17:19:46 +0000 (17:19 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 17 Dec 2016 09:56:44 +0000 (09:56 +0000)
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>
meta/lib/oe/package_manager.py

index bb458691e304d3962ee367c23d50adbad4a1b9d9..e557473999976ee21f7b99145634cd39c03d5fac 100644 (file)
@@ -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: