Fix dependencies after installing built package. refs #8345

[arvados-dev.git] / jenkins / run-library.sh

diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index 3901882f71e023e257e1e744f534f6f8daed9c16..0534b3d945b31ac07d390bca6bd84b6fc4180cfa 100755 (executable)
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -261,7 +261,7 @@ fpm_build () {
   fi
   for pkg in "${build_depends[@]}"; do
       if [[ $TARGET =~ debian|ubuntu ]]; then
-          pkg_deb=$(ls $WORKSPACE/packages/$TARGET/$pkg*.deb | sort -rg | awk 'NR==1')
+          pkg_deb=$(ls "$WORKSPACE/packages/$TARGET/$pkg_"*.deb | sort -rg | awk 'NR==1')
           if [[ -e $pkg_deb ]]; then
               echo "Installing build_dep $pkg from $pkg_deb"
               dpkg -i "$pkg_deb"
@@ -269,8 +269,9 @@ fpm_build () {
               echo "Attemping to install build_dep $pkg using apt-get"
               apt-get install -y "$pkg"
           fi
+          apt-get -y -f install
       else
-          pkg_rpm=$(ls $WORKSPACE/packages/$TARGET/$pkg*.rpm | sort -rg | awk 'NR==1')
+          pkg_rpm=$(ls "$WORKSPACE/packages/$TARGET/$pkg"-[0-9]*.rpm | sort -rg | awk 'NR==1')
           if [[ -e $pkg_rpm ]]; then
               echo "Installing build_dep $pkg from $pkg_rpm"
               rpm -i "$pkg_rpm"