mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
Merge branch 'master' into 'master'
checkupdates: Save app data to correct metadata format Closes #461 See merge request fdroid/fdroidserver!476
This commit is contained in:
commit
ae8635633d
@ -510,14 +510,13 @@ def checkupdates_app(app):
|
|||||||
logging.warn('Invalid auto update mode "' + mode + '" on ' + app.id)
|
logging.warn('Invalid auto update mode "' + mode + '" on ' + app.id)
|
||||||
|
|
||||||
if commitmsg:
|
if commitmsg:
|
||||||
metadatapath = os.path.join('metadata', app.id + '.txt')
|
metadata.write_metadata(app.metadatapath, app)
|
||||||
metadata.write_metadata(metadatapath, app)
|
|
||||||
if options.commit:
|
if options.commit:
|
||||||
logging.info("Commiting update for " + metadatapath)
|
logging.info("Commiting update for " + app.metadatapath)
|
||||||
gitcmd = ["git", "commit", "-m", commitmsg]
|
gitcmd = ["git", "commit", "-m", commitmsg]
|
||||||
if 'auto_author' in config:
|
if 'auto_author' in config:
|
||||||
gitcmd.extend(['--author', config['auto_author']])
|
gitcmd.extend(['--author', config['auto_author']])
|
||||||
gitcmd.extend(["--", metadatapath])
|
gitcmd.extend(["--", app.metadatapath])
|
||||||
if subprocess.call(gitcmd) != 0:
|
if subprocess.call(gitcmd) != 0:
|
||||||
raise FDroidException("Git commit failed")
|
raise FDroidException("Git commit failed")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user