[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4172/8267] package_ipk: Improve failure debug output



commit 596c9eff21ef1197cc72d1eb5e46308f7a10f874
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Sat Jan 21 14:11:52 2017 +0000

    package_ipk: Improve failure debug output
    
    Currently if the dpkg-deb command fails you see an error message like this:
    
    ERROR: nss-3.27.1-r0 do_package_write_ipk: opkg-build execution failed
    ERROR: nss-3.27.1-r0 do_package_write_ipk: Function failed: do_package_ipk
    
    which is pretty much useless. If we use subprocess.check_output, we see a
    traceback and then:
    
    Exception: subprocess.CalledProcessError: Command '<cmd>' returned non-zero exit status 1
    
    Subprocess output:
    <output>
    
    which is much easier to debug from.
    
    (From OE-Core rev: 64c8366a805e9cf0168ea2331c50c8d6a70c6dc4)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/package_ipk.bbclass |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 039b6ab..9fb128b 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -244,11 +244,8 @@ python do_package_ipk () {
             conffiles.close()
 
         os.chdir(basedir)
-        ret = subprocess.call("PATH=\"%s\" %s %s %s" % (localdata.getVar("PATH"),
+        subprocess.check_output("PATH=\"%s\" %s %s %s" % (localdata.getVar("PATH"),
                                                           d.getVar("OPKGBUILDCMD"), pkg, pkgoutdir), 
shell=True)
-        if ret != 0:
-            bb.utils.unlockfile(lf)
-            bb.fatal("opkg-build execution failed")
 
         if d.getVar('IPK_SIGN_PACKAGES') == '1':
             ipkver = "%s-%s" % (d.getVar('PKGV'), d.getVar('PKGR'))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]