Skip to contentSkip to conversation

classes/compress_doc: add missing import subprocess

PATCH New André Draszik 1 participant 1 message Jan 16, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 classes/compress_doc: add missing import subprocess

From: André Draszik <[email protected]>

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.

---
 meta/classes/compress_doc.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/compress_doc.bbclass +2 -0
index 45bb8fff65..d6d11fad26 100644
@@ -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):
Signature · 1 line
2.20.1