From eeeaebf9c567ff181bfd063f07b0dcbcdf0722d9 Mon Sep 17 00:00:00 2001 From: Evegeny Vereshchagin Date: Mon, 25 Jun 2018 21:57:43 +0000 Subject: [PATCH 1/4] coverity.sh: fix a couple indents --- tools/coverity.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/coverity.sh b/tools/coverity.sh index 561d127d1e..0e04555a48 100755 --- a/tools/coverity.sh +++ b/tools/coverity.sh @@ -42,11 +42,11 @@ if [ "$AUTH_RES" = "Access denied" ]; then echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m" exit 1 else - AUTH=`echo $AUTH_RES | python -c "import sys, json; print json.load(sys.stdin)['upload_permitted']"` + AUTH=`echo $AUTH_RES | python -c "import sys, json; print json.load(sys.stdin)['upload_permitted']"` if [ "$AUTH" = "True" ]; then echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m" else - WHEN=`echo $AUTH_RES | python -c "import sys; json; print json.load(sys.stdin)['next_upload_permitted_at']"` + WHEN=`echo $AUTH_RES | python -c "import sys; json; print json.load(sys.stdin)['next_upload_permitted_at']"` echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m" exit 0 fi From 096eec29cd93adbf1bb70a91d1f9f0d713625125 Mon Sep 17 00:00:00 2001 From: Evegeny Vereshchagin Date: Mon, 25 Jun 2018 21:59:28 +0000 Subject: [PATCH 2/4] coverity.sh: make the script compatible with Python 3 --- tools/coverity.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/coverity.sh b/tools/coverity.sh index 0e04555a48..40acbb0411 100755 --- a/tools/coverity.sh +++ b/tools/coverity.sh @@ -42,11 +42,11 @@ if [ "$AUTH_RES" = "Access denied" ]; then echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m" exit 1 else - AUTH=`echo $AUTH_RES | python -c "import sys, json; print json.load(sys.stdin)['upload_permitted']"` + AUTH=`echo $AUTH_RES | python -c "import sys, json; print(json.load(sys.stdin)['upload_permitted'])"` if [ "$AUTH" = "True" ]; then echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m" else - WHEN=`echo $AUTH_RES | python -c "import sys; json; print json.load(sys.stdin)['next_upload_permitted_at']"` + WHEN=`echo $AUTH_RES | python -c "import sys; json; print(json.load(sys.stdin)['next_upload_permitted_at'])"` echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m" exit 0 fi From 1e79d09ef9f7befe5d1e17999b85d89073857e63 Mon Sep 17 00:00:00 2001 From: Evegeny Vereshchagin Date: Mon, 25 Jun 2018 22:02:41 +0000 Subject: [PATCH 3/4] coverity.sh: use a comma to separate module names Otherwise Python bails out with ``` Traceback (most recent call last): File "", line 1, in NameError: name 'json' is not defined ``` See https://travis-ci.org/systemd/systemd/jobs/397490437 --- tools/coverity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/coverity.sh b/tools/coverity.sh index 40acbb0411..1fc5b1cf99 100755 --- a/tools/coverity.sh +++ b/tools/coverity.sh @@ -46,7 +46,7 @@ else if [ "$AUTH" = "True" ]; then echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m" else - WHEN=`echo $AUTH_RES | python -c "import sys; json; print(json.load(sys.stdin)['next_upload_permitted_at'])"` + WHEN=`echo $AUTH_RES | python -c "import sys, json; print(json.load(sys.stdin)['next_upload_permitted_at'])"` echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m" exit 0 fi From f3a020d153b10526a7787a9530cf0eabf8c5d031 Mon Sep 17 00:00:00 2001 From: Evegeny Vereshchagin Date: Mon, 25 Jun 2018 22:22:29 +0000 Subject: [PATCH 4/4] coverity.sh: fail if uploading data to Coverity Scan is forbidden --- tools/coverity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/coverity.sh b/tools/coverity.sh index 1fc5b1cf99..af4c920cd2 100755 --- a/tools/coverity.sh +++ b/tools/coverity.sh @@ -48,7 +48,7 @@ else else WHEN=`echo $AUTH_RES | python -c "import sys, json; print(json.load(sys.stdin)['next_upload_permitted_at'])"` echo -e "\033[33;1mCoverity Scan analysis NOT authorized until $WHEN.\033[0m" - exit 0 + exit 1 fi fi