gryf/mc_uadf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use subprocess.run instaead oc check_call

Browse Source
This commit is contained in:
gryf
2023-10-18 15:12:22 +02:00
parent c33655a12c
commit c78dbacd0e
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
uadf
View File

@@ -107,13 +107,11 @@ class UAdf(extfslib.Archive):
fdesc, tmp_fname = tempfile.mkstemp(suffix=".adf") fdesc, tmp_fname = tempfile.mkstemp(suffix=".adf")
os.close(fdesc) os.close(fdesc)
try: result = subprocess.run([self.DMS, '-q', 'u', self._arch,
subprocess.check_call([self.DMS, '-q', 'u', self._arch,
"+" + tmp_fname]) "+" + tmp_fname])
if result.returncode == 0:
self._arch = tmp_fname self._arch = tmp_fname
self._clean = False self._clean = False
except (subprocess.CalledProcessError, OSError):
pass
def _parse_banner(self, string): def _parse_banner(self, string):
match = BANNER_PAT.match(string) match = BANNER_PAT.match(string)
@@ -196,10 +194,14 @@ class UAdf(extfslib.Archive):
extract_dir = tempfile.mkdtemp() extract_dir = tempfile.mkdtemp()
cmd = [self.ARCHIVER, "-d", extract_dir, self._arch, real_src] cmd = [self.ARCHIVER, "-d", extract_dir, self._arch, real_src]
if check_call(cmd, stdout=open(os.devnull, 'wb'), result = subprocess.run(cmd, stdout=open(os.devnull, 'wb'),
stderr=open(os.devnull, 'wb')) != 0: stderr=open(os.devnull, 'wb'))
error_msg = self._parse_banner(result.stderr)
if error_msg:
sys.stderr.write("unadf returned with error:\n")
sys.stderr.write(error_msg)
shutil.rmtree(extract_dir) shutil.rmtree(extract_dir)
sys.stderr.write("unadf returned with nonzero exit code\n")
return 1 return 1
# use subprocess, as shutil will crash on binary encoded filenames # use subprocess, as shutil will crash on binary encoded filenames