mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-12 18:20:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

New metadata field: Vercode Operation

Browse source
This commit is contained in:
Daniel Martí 2013-11-01 13:25:50 +01:00
parent 0c8283bc1a
commit d507b2e894
3 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fdroidserver/checkupdates.py
View file

@ -333,6 +333,7 @@ def main():
logmsg = None
tag = None
msg = None
mode = app['Update Check Mode']
if mode == 'Tags':
(version, vercode, tag) = check_tags(app, config['sdk_path'])
@ -346,17 +347,21 @@ def main():
(version, vercode) = check_http(app)
elif mode == 'Static':
version = None
vercode = 'Checking disabled'
msg = 'Checking disabled'
elif mode == 'None':
version = None
vercode = 'Checking disabled'
msg = 'Checking disabled'
else:
version = None
vercode = 'Invalid update check method'
msg = 'Invalid update check method'
if vercode and app['Vercode Operation']:
op = app['Vercode Operation'].replace("%c", str(int(vercode)))
vercode = str(eval(op))
updating = False
if not version:
print "..." + vercode
print "...%s" % msg
elif vercode == app['Current Version Code']:
print "...up to date"
else:

21
fdroidserver/common.py
View file

@ -197,7 +197,7 @@ class vcs_git(vcs):
self.refreshed = True
# Check out the appropriate revision...
rev = str(rev if rev else 'origin/master')
if subprocess.call(['git', 'checkout', '-f', rev], cwd=self.local) != 0:
if subprocess.call(['git', 'checkout', '-f', rev], cwd=self.local) != 0:
raise VCSException("Git checkout failed")
# Get rid of any uncontrolled files left behind...
if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
@ -211,14 +211,14 @@ class vcs_git(vcs):
if subprocess.call(['git', 'submodule', 'update'],
cwd=self.local) != 0:
raise VCSException("Git submodule update failed")
if subprocess.call(['git', 'submodule', 'foreach',
'git', 'reset', '--hard'],
cwd=self.local) != 0:
raise VCSException("Git submodule reset failed")
if subprocess.call(['git', 'submodule', 'foreach',
'git', 'clean', '-dffx'],
cwd=self.local) != 0:
raise VCSException("Git submodule clean failed")
if subprocess.call(['git', 'submodule', 'foreach',
'git', 'reset', '--hard'],
cwd=self.local) != 0:
raise VCSException("Git submodule reset failed")
if subprocess.call(['git', 'submodule', 'foreach',
'git', 'clean', '-dffx'],
cwd=self.local) != 0:
raise VCSException("Git submodule clean failed")
def gettags(self):
self.checkrepo()
@ -566,6 +566,7 @@ def parse_metadata(metafile, verbose=False):
thisinfo['AntiFeatures'] = None
thisinfo['Archive Policy'] = None
thisinfo['Update Check Mode'] = 'None'
thisinfo['Vercode Operation'] = None
thisinfo['Auto Update Mode'] = 'None'
thisinfo['Current Version'] = ''
thisinfo['Current Version Code'] = '0'
@ -829,6 +830,8 @@ def write_metadata(dest, app, verbose=False):
writefield('Archive Policy')
writefield('Auto Update Mode')
writefield('Update Check Mode')
if app['Vercode Operation']:
writefield('Vercode Operation')
if 'Update Check Data' in app:
writefield('Update Check Data')
if len(app['Current Version']) > 0: