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:
04b6130
)
Revert "Keep version names even if found separate from the code"
author
Daniel Martí
<mvdan@mvdan.cc>
Fri, 20 Jun 2014 09:10:52 +0000
(11:10 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Fri, 20 Jun 2014 09:10:52 +0000
(11:10 +0200)
This reverts commit
75381ef14718f3821acefaa64a4f7d5243ba15df
.
fdroidserver/common.py
patch
|
blob
|
history
diff --git
a/fdroidserver/common.py
b/fdroidserver/common.py
index 8c7c028676c347bffc31c7fc9dfe49f0e97e5356..edd1a6a2aae3d53939feaeeb5df265f860dfa35b 100644
(file)
--- a/
fdroidserver/common.py
+++ b/
fdroidserver/common.py
@@
-861,12
+861,12
@@
def parse_androidmanifests(paths, ignoreversions=None):
max_version = None
max_vercode = None
max_package = None
max_version = None
max_vercode = None
max_package = None
- version = None
- vercode = None
for path in paths:
gradle = has_extension(path, 'gradle')
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
# Remember package name, may be defined separately from version+vercode
package = max_package
@@
-906,7
+906,7
@@
def parse_androidmanifests(paths, ignoreversions=None):
max_version = "Ignore"
if max_version is None:
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 (max_version, max_vercode, max_package)