synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Challenge APK files: less output by default

This commit is contained in:
Oliver Smith 2017-07-14 19:32:57 +02:00
parent b0dbff4c76
commit 69bb66cbd4
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pmb/challenge/apk.py
View File

@ -41,7 +41,7 @@ def contents_diff(tar_a, tar_b, member_a, member_b, name):
for temp_file in temp_files:
os.remove(temp_file)
if equal:
logging.debug("=> OK!")
logging.verbose("=> OK!")
else:
raise RuntimeError("File '" + name + "' is different!")
@ -90,9 +90,9 @@ def apk(args, apk_a, apk_b):
success = True
for name in list_a:
try:
logging.debug("Compare: " + name)
logging.verbose("Compare: " + name)
if name == ".PKGINFO":
logging.debug(
logging.verbose(
"=> Skipping: expected to be different")
continue
@ -104,12 +104,12 @@ def apk(args, apk_a, apk_b):
"Entry '" + name + "' has a different type!")
if member_a.isdir():
logging.debug("=> Skipping: directory")
logging.verbose("=> Skipping: directory")
elif member_a.isfile():
contents_diff(tar_a, tar_b, member_a, member_b, name)
elif member_a.issym() or member_a.islnk():
if member_a.linkname == member_b.linkname:
logging.debug(
logging.verbose(
"=> Both link to " + member_a.linkname)
else:
raise RuntimeError(