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

Merge branch 'master' into verbose-rewrite

Browse source 
Conflicts:
	fdroidserver/common.py
This commit is contained in:
Daniel Martí 2013-11-03 14:00:09 +01:00
commit 65e708908e
3 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/checkupdates.py
View file

@ -455,8 +455,12 @@ def main():
common.write_metadata(metafile, app)
if options.commit and logmsg:
print "Commiting update for " + metafile
if subprocess.call(["git", "commit", "-m",
logmsg, "--", metafile]) != 0:
gitcmd = ["git", "commit", "-m",
logmsg]
if 'auto_author' in config:
gitcmd.extend(['--author', config['auto_author']])
gitcmd.extend(["--", metafile])
if subprocess.call(gitcmd) != 0:
print "Git commit failed"
sys.exit(1)