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:
d17da07
)
checkupdates: check packages in AM.xml files too
author
Daniel Martí
<mvdan@mvdan.cc>
Sun, 1 Nov 2015 11:35:36 +0000
(12:35 +0100)
committer
Daniel Martí
<mvdan@mvdan.cc>
Sun, 1 Nov 2015 11:35:36 +0000
(12:35 +0100)
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index a1a5b41d653b07089281594e7e5b11c5787960c9..3e88697668ebb72a48eed0c43ba6d848fb69ba4a 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-1070,7
+1070,9
@@
def parse_androidmanifests(paths, app):
else:
xml = parse_xml(path)
if "package" in xml.attrib:
- package = xml.attrib["package"].encode('utf-8')
+ s = xml.attrib["package"].encode('utf-8')
+ if app_matches_packagename(app, s):
+ package = s
if "{http://schemas.android.com/apk/res/android}versionName" in xml.attrib:
version = xml.attrib["{http://schemas.android.com/apk/res/android}versionName"].encode('utf-8')
base_dir = os.path.dirname(path)