Merge pull request #191 from cms-sw/iarspider-patch-1

Update cmspm
cms-sw · Oct 27, 2022 · 935c317 · 935c317
2 parents 84ef658 + eae85ea
commit 935c317
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/cmspm b/cmspm
@@ -257,9 +257,13 @@ def popen(args, merge_stderr = True, shell = False):
   print(args)
   p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=stderr, close_fds=True, shell=shell)
   r = p.communicate()[0]
-  print (r)
+  print (r.decode("utf-8", errors="replace"))
   if p.returncode != 0:
-    raise CalledProcessError(p.returncode, ' '.join(args))
+    if isinstance(args, str):
+      str_args = args
+    else:
+      str_args = ' '.join(args)
+    raise CalledProcessError(p.returncode, str_args)
   return r
 
 def queryCVS(args, cvsroot, tries=5):