From 8bb2c7d4b19a7ec15777d748bb30639982a01e45 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 9 Mar 2021 12:30:53 +0100 Subject: [PATCH] metadata: stop setting up source repo when running lint/rewritemeta broken in 54e8867a7ed2918709290be8f8fc1e8b681767e4 --- examples/fdroid_fetchsrclibs.py | 2 +- fdroidserver/build.py | 2 +- fdroidserver/metadata.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/fdroid_fetchsrclibs.py b/examples/fdroid_fetchsrclibs.py index 3dc4e423..d88b9fa5 100644 --- a/examples/fdroid_fetchsrclibs.py +++ b/examples/fdroid_fetchsrclibs.py @@ -21,7 +21,7 @@ def main(): options = parser.parse_args() common.options = options pkgs = common.read_pkg_args(options.appid, True) - allapps = metadata.read_metadata(pkgs) + allapps = metadata.read_metadata(pkgs, check_vcs=True) apps = common.read_app_args(options.appid, allapps, True) srclib_dir = os.path.join('build', 'srclib') os.makedirs(srclib_dir, exist_ok=True) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index dd454d1c..79df3013 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -1012,7 +1012,7 @@ def main(): # Read all app and srclib metadata pkgs = common.read_pkg_args(options.appid, True) - allapps = metadata.read_metadata(pkgs, options.refresh, sort_by_time=True) + allapps = metadata.read_metadata(pkgs, options.refresh, sort_by_time=True, check_vcs=True) apps = common.read_app_args(options.appid, allapps, True) for appid, app in list(apps.items()): diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index ff75aa8a..6c3c4815 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -541,7 +541,7 @@ def read_srclibs(): srclibs[srclibname] = parse_yaml_srclib(metadatapath) -def read_metadata(appids={}, refresh=True, sort_by_time=False): +def read_metadata(appids={}, refresh=True, sort_by_time=False, check_vcs=False): """Return a list of App instances sorted newest first This reads all of the metadata files in a 'data' repository, then @@ -597,7 +597,7 @@ def read_metadata(appids={}, refresh=True, sort_by_time=False): if appid in apps: _warn_or_exception(_("Found multiple metadata files for {appid}") .format(appid=appid)) - app = parse_metadata(metadatapath, appid in appids, refresh) + app = parse_metadata(metadatapath, check_vcs, refresh) check_metadata(app) apps[app.id] = app