From 868516f3fdbd2c20bab7018dfc247f0031ceeef9 Mon Sep 17 00:00:00 2001 From: Michael von Glasow Date: Tue, 15 Jan 2019 12:36:17 +0000 Subject: [PATCH 1/2] Clarify warning message about skipped sudo commands --- fdroidserver/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 375003e3..7acc94e9 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -392,7 +392,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext f.write(common.get_android_tools_version_log(build.ndk_path())) else: if build.sudo: - logging.warning('%s:%s runs this on the buildserver with sudo:\n\t%s' + logging.warning('%s:%s runs this on the buildserver with sudo:\n\t%s\nThese commands were skipped because fdroid build is running without the --on-server option.' % (app.id, build.versionName, build.sudo)) # Prepare the source code... From f8f17a430d42419330b581c086fd9caf3c7df657 Mon Sep 17 00:00:00 2001 From: Michael von Glasow Date: Tue, 15 Jan 2019 14:14:09 +0000 Subject: [PATCH 2/2] Reword warning message about sudo commands being skipped --- fdroidserver/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 7acc94e9..5347475b 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -392,7 +392,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext f.write(common.get_android_tools_version_log(build.ndk_path())) else: if build.sudo: - logging.warning('%s:%s runs this on the buildserver with sudo:\n\t%s\nThese commands were skipped because fdroid build is running without the --on-server option.' + logging.warning('%s:%s runs this on the buildserver with sudo:\n\t%s\nThese commands were skipped because fdroid build is not running on a dedicated build server.' % (app.id, build.versionName, build.sudo)) # Prepare the source code...