1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-11 15:13:27 +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:
Marcus 2018-03-09 20:13:51 +00:00
commit ae8635633d

View File

@ -510,14 +510,13 @@ def checkupdates_app(app):
logging.warn('Invalid auto update mode "' + mode + '" on ' + app.id)
if commitmsg:
metadatapath = os.path.join('metadata', app.id + '.txt')
metadata.write_metadata(metadatapath, app)
metadata.write_metadata(app.metadatapath, app)
if options.commit:
logging.info("Commiting update for " + metadatapath)
logging.info("Commiting update for " + app.metadatapath)
gitcmd = ["git", "commit", "-m", commitmsg]
if 'auto_author' in config:
gitcmd.extend(['--author', config['auto_author']])
gitcmd.extend(["--", metadatapath])
gitcmd.extend(["--", app.metadatapath])
if subprocess.call(gitcmd) != 0:
raise FDroidException("Git commit failed")