kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00
Code Activity

Merge branch 'master' of gitorious.org:f-droid/fdroidserver

Browse Source
This commit is contained in:
Ciaran Gultnieks 2014-01-24 11:56:01 +00:00
commit 0c79ac54e6
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdroidserver/build.py
View File

@ -611,8 +611,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
commands = [config['gradle']] commands = [config['gradle']]
if 'preassemble' in thisbuild: if 'preassemble' in thisbuild:
for task in thisbuild['preassemble'].split(): commands += thisbuild['preassemble'].split()
commands.append(task)
commands += ['assemble'+''.join(flavours)+'Release'] commands += ['assemble'+''.join(flavours)+'Release']
p = FDroidPopen(commands, cwd=gradle_dir) p = FDroidPopen(commands, cwd=gradle_dir)

15
fdroidserver/common.py
View File

@ -454,9 +454,21 @@ class vcs_gitsvn(vcs):
else: else:
# No tag found, normal svn rev translation # No tag found, normal svn rev translation
# Translate svn rev into git format # Translate svn rev into git format
p = subprocess.Popen(['git', 'svn', 'find-rev', 'r' + rev], rev_split = rev.split('/')
if len(rev_split) > 1:
treeish = rev_split[0]
svn_rev = rev_split[1]
else:
# if no branch is specified, then assume trunk (ie. 'master'
# branch):
treeish = 'master'
svn_rev = rev
p = subprocess.Popen(['git', 'svn', 'find-rev', 'r' + svn_rev, treeish],
cwd=self.local, stdout=subprocess.PIPE) cwd=self.local, stdout=subprocess.PIPE)
git_rev = p.communicate()[0].rstrip() git_rev = p.communicate()[0].rstrip()
if p.returncode != 0 or not git_rev: if p.returncode != 0 or not git_rev:
# Try a plain git checkout as a last resort # Try a plain git checkout as a last resort
p = subprocess.Popen(['git', 'checkout', rev], cwd=self.local, p = subprocess.Popen(['git', 'checkout', rev], cwd=self.local,
@ -475,6 +487,7 @@ class vcs_gitsvn(vcs):
print out print out
else: else:
raise VCSException("Git svn checkout failed") raise VCSException("Git svn checkout failed")
# Get rid of any uncontrolled files left behind... # Get rid of any uncontrolled files left behind...
if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0: if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
raise VCSException("Git clean failed") raise VCSException("Git clean failed")

3
fdroidserver/lint.py
View File

@ -80,6 +80,9 @@ def main():
appid = app['id'] appid = app['id']
lastcommit = '' lastcommit = ''
if app['Disabled']:
continue
for build in app['builds']: for build in app['builds']:
if 'commit' in build and 'disable' not in build: if 'commit' in build and 'disable' not in build:
lastcommit = build['commit'] lastcommit = build['commit']

5
fdroidserver/update.py
View File

@ -532,7 +532,12 @@ def scan_apks(apps, apkcache, repodir, knownapks):
get_icon_dir(repodir, last_density), iconfilename) get_icon_dir(repodir, last_density), iconfilename)
iconpath = os.path.join( iconpath = os.path.join(
get_icon_dir(repodir, density), iconfilename) get_icon_dir(repodir, density), iconfilename)
try:
im = Image.open(last_iconpath) im = Image.open(last_iconpath)
except:
print "WARNING: Invalid image file at %s" % last_iconpath
continue
size = dpi_to_px(density) size = dpi_to_px(density)
im.thumbnail((size, size), Image.ANTIALIAS) im.thumbnail((size, size), Image.ANTIALIAS)