mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-06 15:30:28 +03:00
Merge branch 'master' into verbose-rewrite
Conflicts: fdroidserver/common.py
This commit is contained in:
commit
65e708908e
3 changed files with 39 additions and 18 deletions
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue