[diffoscope] 01/01: comparators.apk: Let classes.dex extraction be optional.

[Chris Lamb]

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

lamby pushed a commit to branch master
in repository diffoscope.

commit 808954e2f5c842fa2fc7472b30d7dae6c08c26a7
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Mar 1 23:02:24 2018 +0000

    comparators.apk: Let classes.dex extraction be optional.
---
 diffoscope/comparators/apk.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/diffoscope/comparators/apk.py b/diffoscope/comparators/apk.py
index dc72b10..464ccfa 100644
--- a/diffoscope/comparators/apk.py
+++ b/diffoscope/comparators/apk.py
@@ -57,10 +57,10 @@ class ApkContainer(Archive):
             'apktool', 'd', '-k', '-m', '-o', self._unpacked, self.source.path,
         ), shell=False, stderr=None, stdout=subprocess.PIPE)
 
-        # Additionally extract the classes.dex file; apktool does not do this.
-        subprocess.check_call((
+        # Optionally extract the classes.dex file; apktool does not do this.
+        subprocess.call((
             'unzip', '-d', self._unpacked, self.source.path, 'classes.dex',
-        ), stderr=None, stdout=subprocess.PIPE)
+        ), stderr=subprocess.PIPE, stdout=subprocess.PIPE)
 
         for root, _, files in os.walk(self._unpacked):
             current_dir = []

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git