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:
f44ad67
)
Try a better regex match for the versionName
author
Daniel Martí
<mvdan@mvdan.cc>
Thu, 4 Jul 2013 13:55:44 +0000
(15:55 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Thu, 4 Jul 2013 13:55:44 +0000
(15:55 +0200)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index f27e189fbaaf9c6341b69d1bff66ee35d8add5d5..1f6a266e483d9dc87d652e9ac14e3648534082cb 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-904,7
+904,7
@@
def fetch_real_name(app_dir):
def parse_androidmanifest(app_dir):
vcsearch = re.compile(r'.*android:versionCode="([0-9]+?)".*').search
- vnsearch = re.compile(r'.*android:versionName="([^
@
]+?)".*').search
+ vnsearch = re.compile(r'.*android:versionName="([^
"
]+?)".*').search
psearch = re.compile(r'.*package="([^"]+)".*').search
vnsearch_xml = re.compile(r'.*"(app_|)version">([^<]+?)<.*').search
version = None