chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c583ec
)
Fix issues with .apklib files being seen as output apks
author
Daniel Martí
<mvdan@mvdan.cc>
Wed, 23 Oct 2013 17:53:07 +0000
(19:53 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Wed, 23 Oct 2013 17:54:04 +0000
(19:54 +0200)
fdroidserver/build.py
patch
|
blob
|
history
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index 0bae7bffb24325ccdd2a8ec608b294836977631a..4364f73ddda15ec3837f11dc485127a6c136c726 100644
(file)
--- a/
fdroidserver/build.py
+++ b/
fdroidserver/build.py
@@
-562,7
+562,7
@@
def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
p.stdout_apk, re.S|re.M)
if not m:
- m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk",
+ m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk
[^l]
",
p.stdout_apk, re.S|re.M)
if not m:
# This format is found in com.github.mobile, com.yubico.yubitotp and com.botbrew.basil for example...