[ARVADOS-DEV] updated: b67ed2f088b4ea8a7753ad4882066ffff8ca1d65

[Git user]

Summary of changes:
 jenkins/run_upload_packages.py | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

       via  b67ed2f088b4ea8a7753ad4882066ffff8ca1d65 (commit)
      from  6a11712ab8c5dd5efb1f6bb3e3989888a13971a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b67ed2f088b4ea8a7753ad4882066ffff8ca1d65
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Dec 22 22:05:52 2020 -0500

    Iterate over packages one by one in run_upload_packages.py
    
    refs #17219
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/jenkins/run_upload_packages.py b/jenkins/run_upload_packages.py
index efca3a2..0840f2f 100755
--- a/jenkins/run_upload_packages.py
+++ b/jenkins/run_upload_packages.py
@@ -186,20 +186,21 @@ class DistroPackageSuite(PackageSuite):
 
 class DebianPackageSuite(DistroPackageSuite):
     APT_SCRIPT = """
-set -x
 cd "$1"; shift
 DISTNAME=$1; shift
-set +e
-aptly repo search "$DISTNAME" "${@%.deb}" >/dev/null 2>&1
-RET=$?
-set -e
-if [[ $RET -eq 0 ]]; then
-  echo "Not adding $@, it is already present in repo $DISTNAME"
-  rm "$@"
-else
-  aptly repo add -remove-files "$DISTNAME" "$@"
-  aptly publish update "$DISTNAME" filesystem:"${DISTNAME%-*}":
-fi
+for package in "$@"; do
+  set +e
+  aptly repo search "$DISTNAME" "${package%.deb}" >/dev/null 2>&1
+  RET=$?
+  set -e
+  if [[ $RET -eq 0 ]]; then
+    echo "Not adding $package, it is already present in repo $DISTNAME"
+    rm "$package"
+  else
+    aptly repo add -remove-files "$DISTNAME" "$package"
+  fi
+done
+aptly publish update "$DISTNAME" filesystem:"${DISTNAME%-*}":
 """
 
     def __init__(self, glob_root, rel_globs, target, ssh_host, ssh_opts, repo):

-----------------------------------------------------------------------


hooks/post-receive
--