'sun.security.pkcs11.SunPKCS11',
'-providerArg', 'opensc-fdroid.cfg']
+ if any(k in config for k in ["keystore", "keystorepass", "keypass"]):
+ st = os.stat(config_file)
+ if st.st_mode & stat.S_IRWXG or st.st_mode & stat.S_IRWXO:
+ logging.warn("unsafe permissions on {0} (should be 0600)!".format(config_file))
+
defconfig = get_default_config()
for k, v in defconfig.items():
if k not in config:
if not test_sdk_exists(config):
sys.exit(3)
- if any(k in config for k in ["keystore", "keystorepass", "keypass"]):
- st = os.stat(config_file)
- if st.st_mode & stat.S_IRWXG or st.st_mode & stat.S_IRWXO:
- logging.warn("unsafe permissions on {0} (should be 0600)!".format(config_file))
-
for k in ["keystorepass", "keypass"]:
if k in config:
write_password_file(k)
max_version = None
max_vercode = None
max_package = None
- version = None
- vercode = None
for path in paths:
gradle = has_extension(path, 'gradle')
+ version = None
+ vercode = None
# Remember package name, may be defined separately from version+vercode
package = max_package
if matches:
vercode = matches.group(1)
- # Better some package name than nothing
- if max_package is None:
+ # Always grab the package name and version name in case they are not
+ # together with the highest version code
+ if max_package is None and package is not None:
max_package = package
+ if max_version is None and version is not None:
+ max_version = version
if max_vercode is None or (vercode is not None and vercode > max_vercode):
if not ignoresearch or not ignoresearch(version):
- max_version = version
- max_vercode = vercode
- max_package = package
+ if version is not None:
+ max_version = version
+ if vercode is not None:
+ max_vercode = vercode
+ if package is not None:
+ max_package = package
else:
max_version = "Ignore"
if max_version is None:
- max_version = version if version else "Unknown"
+ max_version = "Unknown"
return (max_version, max_vercode, max_package)
return FDroidPopen(commands, cwd=cwd, shell=shell, output=False)
-def FDroidPopen(commands, cwd=None, shell=False, output=False):
+def FDroidPopen(commands, cwd=None, shell=False, output=True):
"""
Run a command and capture the possibly huge output.
while not stdout_reader.eof():
while not stdout_queue.empty():
line = stdout_queue.get()
- if output or options.verbose:
+ if output:
# Output directly to console
sys.stdout.write(line)
sys.stdout.flush()