[Buildroot] [PATCHv2 buildroot-test 01/11] autobuild-run: check-requirements does not need to know the login details
Thomas De Schampheleire
patrickdepinguin at gmail.com
Sun Oct 19 19:29:57 UTC 2014
From: Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
check-requirements simply has to know if the results have to be sent, so
it can check on some extra requirements. The username and password are
irrelevant here.
This commit introduces a boolean variable do_send_results to hide these
details.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
---
v2: implement comments on boolean logic (Yann, Maxime, Arnout)
scripts/autobuild-run | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index 7497001..282f15d 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -85,12 +85,12 @@ def check_version():
print "ERROR: script version too old, please upgrade."
sys.exit(1)
-def check_requirements(http_login, http_password):
+def check_requirements(do_send_results=False):
devnull = open(os.devnull, "w")
needed_progs = ["make", "git", "gcc", "timeout"]
missing_requirements = False
- if http_login and http_password:
+ if do_send_results:
needed_progs.append("curl")
for prog in needed_progs:
@@ -553,10 +553,15 @@ if __name__ == '__main__':
check_version()
sysinfo = SystemInfo()
(ninstances, njobs, http_login, http_password, submitter) = config_get()
- check_requirements(http_login, http_password)
- if http_login is None or http_password is None:
+
+ # http_login/password could theoretically be allowed as empty, so check
+ # explicitly on None.
+ do_send_results = (http_login is not None) and (http_password is not None)
+ check_requirements(do_send_results)
+ if not do_send_results:
print "WARN: due to the lack of http login/password details, results will not be submitted"
print "WARN: tarballs of results will be kept locally only"
+
def sigterm_handler(signum, frame):
os.killpg(os.getpgid(os.getpid()), signal.SIGTERM)
sys.exit(1)
--
1.8.5.1
More information about the buildroot
mailing list