kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-16 03:10:09 +02:00
Code Activity

Don't except if already installed on fdroid install

Browse Source
This commit is contained in:
Daniel Martí 2013-12-19 17:58:10 +01:00
parent 84bf3d758f
commit 5ac855af69
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/common.py
View File

@ -163,15 +163,16 @@ def read_app_args(args, options, allapps, allow_vercodes=False):
apk_regex = None
def apknameinfo(basename):
def apknameinfo(filename):
global apk_regex
filename = os.path.basename(filename)
if apk_regex is None:
apk_regex = re.compile(r"^([a-zA-Z\.]+)_([0-9]+)\.apk$")
m = apk_regex.match(basename)
m = apk_regex.match(filename)
try:
result = (m.group(1), m.group(2))
except AttributeError:
raise Exception("Invalid apk name: %s" % basename)
raise Exception("Invalid apk name: %s" % filename)
return result
def getapkname(app, build):
@ -1428,7 +1429,7 @@ def FDroidPopen(commands, cwd=None):
sys.stderr.write(line)
sys.stderr.flush()
result.stderr += line
time.sleep(0.2)
time.sleep(0.1)
p.communicate()
result.returncode = p.returncode

13
fdroidserver/install.py
View File

@ -65,8 +65,7 @@ def main():
# Get the signed apk with the highest vercode
for apkfile in sorted(glob.glob(os.path.join(output_dir, '*.apk'))):
apkfilename = os.path.basename(apkfile)
appid, vercode = common.apknameinfo(apkfilename)
appid, vercode = common.apknameinfo(apkfile)
if appid not in apks:
continue
if vercodes[appid] and vc not in vercodes[appid]:
@ -81,8 +80,7 @@ def main():
for apkfile in sorted(glob.glob(os.path.join(output_dir, '*.apk'))):
apkfilename = os.path.basename(apkfile)
appid, vercode = common.apknameinfo(apkfilename)
appid, vercode = common.apknameinfo(apkfile)
apks[appid] = apkfile
else:
@ -103,8 +101,11 @@ def main():
if line.startswith("Failure"):
fail = line[9:-1]
if fail:
raise Exception("Failed to install %s on %s: %s" % (
apk, dev, fail))
if fail == "INSTALL_FAILED_ALREADY_EXISTS":
print "%s is already installed on %s." % (apk, dev)
else:
raise Exception("Failed to install %s on %s: %s" % (
apk, dev, fail))
print "\nFinished"