diff options
author | Torsten Grote <t@grobox.de> | 2020-03-18 14:24:41 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-03-18 14:24:41 -0300 |
commit | a4796ec47d89a851b260b6fc195494547208a025 (patch) | |
tree | d2941b68ff2ce22c523e7aa634965033b1100560 /nightly-stats.patch | |
download | taler-android-a4796ec47d89a851b260b6fc195494547208a025.tar.gz taler-android-a4796ec47d89a851b260b6fc195494547208a025.tar.bz2 taler-android-a4796ec47d89a851b260b6fc195494547208a025.zip |
Merge all three apps into one repository
Diffstat (limited to 'nightly-stats.patch')
-rw-r--r-- | nightly-stats.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/nightly-stats.patch b/nightly-stats.patch new file mode 100644 index 0000000..689f46a --- /dev/null +++ b/nightly-stats.patch @@ -0,0 +1,38 @@ +diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py +index 0a3a8012..ae3aa0e3 100644 +--- a/fdroidserver/nightly.py ++++ b/fdroidserver/nightly.py +@@ -170,6 +170,7 @@ def main(): + git_mirror_path = os.path.join(repo_basedir, 'git-mirror') + git_mirror_repodir = os.path.join(git_mirror_path, 'fdroid', 'repo') + git_mirror_metadatadir = os.path.join(git_mirror_path, 'fdroid', 'metadata') ++ git_mirror_statsdir = os.path.join(git_mirror_path, 'fdroid', 'stats') + if not os.path.isdir(git_mirror_repodir): + logging.debug(_('cloning {url}').format(url=clone_url)) + try: +@@ -217,6 +218,8 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, + common.local_rsync(options, git_mirror_repodir + '/', 'repo/') + if os.path.isdir(git_mirror_metadatadir): + common.local_rsync(options, git_mirror_metadatadir + '/', 'metadata/') ++ if os.path.isdir(git_mirror_statsdir): ++ common.local_rsync(options, git_mirror_statsdir + '/', 'stats/') + + ssh_private_key_file = _ssh_key_from_debug_keystore() + # this is needed for GitPython to find the SSH key +@@ -246,7 +249,7 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, + config += "keydname = '%s'\n" % DISTINGUISHED_NAME + config += "make_current_version_link = False\n" + config += "accepted_formats = ('txt', 'yml')\n" +- # TODO add update_stats = True ++ config += "update_stats = True\n" + with open('config.py', 'w') as fp: + fp.write(config) + os.chmod('config.py', 0o600) +@@ -293,6 +296,7 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base, + subprocess.check_call(['fdroid', 'update', '--rename-apks', '--create-metadata', '--verbose'], + cwd=repo_basedir) + common.local_rsync(options, repo_basedir + '/metadata/', git_mirror_metadatadir + '/') ++ common.local_rsync(options, repo_basedir + '/stats/', git_mirror_statsdir + '/') + mirror_git_repo.git.add(all=True) + mirror_git_repo.index.commit("update app metadata") + |