[oe-commits] [openembedded-core] 02/05: classes/compress_doc: add missing import subprocess

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 539f65d2533a277233d83d085cb78bdf56a6e16c
Author: André Draszik <andre.draszik at jci.com>
AuthorDate: Wed Jan 16 10:12:38 2019 +0000

    classes/compress_doc: add missing import subprocess
    
    Enabling compress_doc gives the following stack trace:
    
    File: 'exec_python_func() autogenerated', lineno: 2, function: <module>
         0001:
     *** 0002:package_do_compress_doc(d)
         0003:
    File: '/scratch/yocto/swupd.bb/poky/meta/classes/compress_doc.bbclass', lineno: 50, function: package_do_compress_doc
         0046:    mandir = os.path.abspath(dvar + os.sep + d.getVar("mandir"))
         0047:    if os.path.exists(mandir):
         0048:        # Decompress doc files which format is not compress_mode
         0049:        decompress_doc(mandir, compress_mode, decompress_cmds)
     *** 0050:        compress_doc(mandir, compress_mode, compress_cmds)
         0051:
         0052:    infodir = os.path.abspath(dvar + os.sep + d.getVar("infodir"))
         0053:    if os.path.exists(infodir):
         0054:        # Decompress doc files which format is not compress_mode
    File: '/scratch/yocto/swupd.bb/poky/meta/classes/compress_doc.bbclass', lineno: 180, function: compress_doc
         0176:                    _collect_hardlink(hardlink_dict, file)
         0177:                # Normal file
         0178:                elif os.path.isfile(file):
         0179:                    cmd = "%s %s" % (compress_cmds[compress_mode], file)
     *** 0180:                    (retval, output) = subprocess.getstatusoutput(cmd)
         0181:                    if retval:
         0182:                        bb.warn("compress failed %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else ""))
         0183:                        continue
         0184:                    bb.note('compress file %s' % file)
    Exception: NameError: name 'subprocess' is not defined
    
    Fix by adding the missing import in two places.
    
    Signed-off-by: André Draszik <andre.draszik at jci.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/compress_doc.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/compress_doc.bbclass b/meta/classes/compress_doc.bbclass
index 45bb8ff..d6d11fa 100644
--- a/meta/classes/compress_doc.bbclass
+++ b/meta/classes/compress_doc.bbclass
@@ -160,6 +160,7 @@ def _is_compress_doc(file, compress_format_list):
     return False, ''
 
 def compress_doc(topdir, compress_mode, compress_cmds):
+    import subprocess
     hardlink_dict = {}
     for root, dirs, files in os.walk(topdir):
         for f in files:
@@ -187,6 +188,7 @@ def compress_doc(topdir, compress_mode, compress_cmds):
 
 # Decompress doc files which format is not compress_mode
 def decompress_doc(topdir, compress_mode, decompress_cmds):
+    import subprocess
     hardlink_dict = {}
     decompress = True
     for root, dirs, files in os.walk(topdir):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.