From adbd27a01041312f4a3a43438511a2259742b30e Mon Sep 17 00:00:00 2001 From: Owen W. Taylor Date: Aug 20 2018 17:44:58 +0000 Subject: f29 is no longer rawhide --- diff --git a/tools/generate-app-reports.py b/tools/generate-app-reports.py index e4075f1..a26d342 100755 --- a/tools/generate-app-reports.py +++ b/tools/generate-app-reports.py @@ -245,7 +245,7 @@ top_packaged_apps = sorted(packaged_apps, key=lambda a: a.package) top_packaged_apps.sort(key=lambda a: -(a.star_total or 0)) top_packaged_apps = top_packaged_apps[0:100] -info_json = subprocess.check_output(['fedmod', '--dataset=rawhide', 'flatpak-report'] + [a.package for a in packaged_apps]) +info_json = subprocess.check_output(['fedmod', '--dataset=f29', 'flatpak-report'] + [a.package for a in packaged_apps]) info = json.loads(info_json) for a in packaged_apps: a.extra_packages = info['flatpaks'][a.package]['extra'] @@ -258,7 +258,7 @@ for p, i in info['packages'].items(): else: extra_packages[p] = { 'all': i['used_by']} -top_info_json = subprocess.check_output(['fedmod', '--dataset=rawhide', 'flatpak-report'] + [a.package for a in top_packaged_apps]) +top_info_json = subprocess.check_output(['fedmod', '--dataset=f29', 'flatpak-report'] + [a.package for a in top_packaged_apps]) top_info = json.loads(top_info_json) for p, i in top_info['packages'].items(): diff --git a/tools/generate-runtime-report.py b/tools/generate-runtime-report.py index 1b4b161..53df72c 100755 --- a/tools/generate-runtime-report.py +++ b/tools/generate-runtime-report.py @@ -19,7 +19,7 @@ def warn(msg): print("{}: \033[31m{}\033[39m".format(os.path.basename(sys.argv[0]), msg), file=sys.stderr) def fedmod_output(args): - return subprocess.check_output(['fedmod', '--dataset=rawhide'] + args, encoding='utf-8') + return subprocess.check_output(['fedmod', '--dataset=f29'] + args, encoding='utf-8') _nvr_to_name_re = re.compile('^(.*)-[^-]*-[^-]*') def nvr_to_name(nvr): diff --git a/tools/util.py b/tools/util.py index 3ca6a02..324055e 100644 --- a/tools/util.py +++ b/tools/util.py @@ -11,7 +11,7 @@ XDG_CACHE_HOME = os.environ.get("XDG_CACHE_HOME") or os.path.expanduser("~/.cach # This needs to be in sync with fedmod REPOS = [ - "rawhide-packages" + "f29-packages" ] _log_name = None @@ -127,7 +127,7 @@ def get_repo_cacheable(name, generate): with open(repomd_path, 'rb') as f: repomd_contents = f.read() except (OSError, IOError): - print("Cannot read {}, try 'fedmod --dataset=rawhide fetch-metadata'".format(repomd_path), file=sys.stderr) + print("Cannot read {}, try 'fedmod --dataset=f29 fetch-metadata'".format(repomd_path), file=sys.stderr) sys.exit(1) repo_info[repo] = (repo_dir, repomd_contents)