From 2cbb5576c7404c4447bcb6e843f53fe4be984d8d Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Wed, 12 Oct 2022 19:10:50 +0200 Subject: [PATCH 1/2] Drop VCS version check on every build This was introduced in https://gitlab.com/fdroid/fdroidserver/-/merge_requests/391 I don't think it is needed anymore. Also log appid:versionCode --- fdroidserver/build.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 726666b3..d724a3c2 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -1111,8 +1111,7 @@ def main(): vcs, build_dir = common.setup_vcs(app) first = False - logging.info("Using %s" % vcs.clientversion()) - logging.debug("Checking " + build.versionName) + logging.debug("Checking %s:%s" % (appid, build.versionCode)) if trybuild(app, build, build_dir, output_dir, log_dir, also_check_dir, srclib_dir, extlib_dir, tmp_dir, repo_dir, vcs, options.test, From 3eea5f7c09f9ce34ee381a9cd05116cb5c53ef97 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 14 Oct 2022 15:13:55 +0200 Subject: [PATCH 2/2] Don't get_android_tools_version_log for non builds --- fdroidserver/build.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index d724a3c2..794cbbd9 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -1100,8 +1100,6 @@ def main(): timer = None tools_version_log = '' - if not options.onserver: - tools_version_log = common.get_android_tools_version_log() try: # For the first build of a particular app, we need to set up