Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix so upgrade of release builds works

Browse source
This commit is contained in:
Eric House 2020-04-11 19:23:20 -07:00
parent ca6a0868c9
commit 29ed46e12b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/scripts/info.py
View file

@ -204,7 +204,7 @@ def getOrderedApks( path, appID, debug ):
files = ((os.stat(apk).st_mtime, apk) for apk in glob.glob(pattern)) files = ((os.stat(apk).st_mtime, apk) for apk in glob.glob(pattern))
for mtime, file in sorted(files, reverse=True): for mtime, file in sorted(files, reverse=True):
info = getAAPTInfo(file) info = getAAPTInfo(file)
if info['appID'] == appID: if info and 'appID' in info and info['appID'] == appID:
apkToCode[file] = info['versionCode'] apkToCode[file] = info['versionCode']
apkToMtime[file] = mtime apkToMtime[file] = mtime
result = sorted(apkToCode.keys(), reverse=True, key=lambda file: (apkToCode[file], apkToMtime[file])) result = sorted(apkToCode.keys(), reverse=True, key=lambda file: (apkToCode[file], apkToMtime[file]))
@ -326,7 +326,7 @@ def getApp( params, name = None, debug = False):
apache.log_error( "name: %s; installer: %s; gvers: %s" apache.log_error( "name: %s; installer: %s; gvers: %s"
% (name, installer, vers) ) % (name, installer, vers) )
print "name: %s; installer: %s; vers: %s" % (name, installer, vers) print "name: %s; installer: %s; vers: %s" % (name, installer, vers)
dir = k_filebase + k_apkDir + 'rel/' dir = k_filebase + k_apkDir
apk = getNextAfter( dir, name, vers, debug ) apk = getNextAfter( dir, name, vers, debug )
if apk: if apk:
apk = apk[len(k_filebase):] # strip fs path apk = apk[len(k_filebase):] # strip fs path
@ -569,7 +569,7 @@ def getUpdates( req, params ):
# result[k_XLATEINFO] = xlateResult; # result[k_XLATEINFO] = xlateResult;
result = json.dumps( result ) result = json.dumps( result )
# apache.log_error( result ) apache.log_error( 'getUpdates() => ' + result )
return result return result
def clearShelf(): def clearShelf():