projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13931-cwltool-deps' refs #13931
[arvados.git]
/
build
/
package-testing
/
deb-common-test-packages.sh
diff --git
a/build/package-testing/deb-common-test-packages.sh
b/build/package-testing/deb-common-test-packages.sh
index 5f32a606dac3ee43e75c53fad95b75b82767afc0..900b091959107ace13d606f0a433d5d90c56f0d9 100755
(executable)
--- a/
build/package-testing/deb-common-test-packages.sh
+++ b/
build/package-testing/deb-common-test-packages.sh
@@
-1,4
+1,7
@@
#!/bin/bash
#!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
set -eu
set -eu
@@
-11,7
+14,7
@@
export ARV_PACKAGES_DIR="/arvados/packages/$target"
dpkg-query --show > "$ARV_PACKAGES_DIR/$1.before"
apt-get -qq update
dpkg-query --show > "$ARV_PACKAGES_DIR/$1.before"
apt-get -qq update
-apt-get --assume-yes --
force-yes
install "$1"
+apt-get --assume-yes --
allow-unauthenticated
install "$1"
dpkg-query --show > "$ARV_PACKAGES_DIR/$1.after"
dpkg-query --show > "$ARV_PACKAGES_DIR/$1.after"
@@
-24,7
+27,13
@@
cd /tmp/opts
export ARV_PACKAGES_DIR="/arvados/packages/$target"
export ARV_PACKAGES_DIR="/arvados/packages/$target"
-dpkg-deb -x $(ls -t "$ARV_PACKAGES_DIR/$1"_*.deb | head -n1) .
+if [[ -f $(ls -t "$ARV_PACKAGES_DIR/$1"_*.deb | head -n1) ]] ; then
+ debpkg=$(ls -t "$ARV_PACKAGES_DIR/$1"_*.deb | head -n1)
+else
+ debpkg=$(ls -t "$ARV_PACKAGES_DIR/processed/$1"_*.deb | head -n1)
+fi
+
+dpkg-deb -x $debpkg .
while read so && [ -n "$so" ]; do
echo
while read so && [ -n "$so" ]; do
echo