From e18b6e9523bba780f2bced367f23b7e33cc02249 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 4 Aug 2023 10:55:53 -0400 Subject: [PATCH] jjb: Support s3cmd 2.3 in lttng-modules build Change-Id: I628954139b075160f84ea1fd9acd8125d9e6b410 --- scripts/lttng-modules/param-build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh index 3657fc8..b5c8b8f 100644 --- a/scripts/lttng-modules/param-build.sh +++ b/scripts/lttng-modules/param-build.sh @@ -648,12 +648,16 @@ fi obj_url="$obj_url_prefix/$obj_name" set +e -s3cmd -c "$WORKSPACE/.s3cfg" get "$obj_url" +# In s3cmd 2.3, the return code of get when an object does not exist (64) +# is different than in 2.2 (12). The return codes of 's3cmd info' are +# consistent between 2.2 and 2.3. +s3cmd -c "$WORKSPACE/.s3cfg" info "$obj_url" ret=$? set -e case "$ret" in "0") + s3cmd -c "$WORKSPACE/.s3cfg" get "$obj_url" extract_archive_obj ;; -- 2.34.1