[ARVADOS-DEV] created: cca8aa47c3e735f9e3b7ac4b48a6ca81237a0edb

[Git user]

        at  cca8aa47c3e735f9e3b7ac4b48a6ca81237a0edb (commit)


commit cca8aa47c3e735f9e3b7ac4b48a6ca81237a0edb
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Mar 16 00:37:52 2016 -0400

    Fix backports dir search for PACKAGE="llfuse==0.41.1". No issue #

diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index c2e9b40..db99246 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -255,19 +255,17 @@ fpm_build () {
   declare -a build_depends=()
   declare -a fpm_depends=()
   declare -a fpm_exclude=()
-  FPM_INFO=""
-  if [[ -d "$PACKAGE_DIR" ]]; then
-      FPM_INFO="$PACKAGE_DIR/fpm-info.sh"
-  elif [[ -e "${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE}/fpm-info.sh" ]]; then
-      FPM_INFO="${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE}/fpm-info.sh"
-      debug_echo "Found fpm-info.sh in backports: $FPM_INFO"
-  elif [[ -e "${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE_NAME}/fpm-info.sh" ]]; then
-      FPM_INFO="${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE_NAME}/fpm-info.sh"
-  fi
-  if [[ -e "$FPM_INFO" ]]; then
-      debug_echo "Loading fpm overrides from $FPM_INFO"
-      source "$FPM_INFO"
-  fi
+  declare -a fpm_dirs=("$PACKAGE_DIR"
+      "${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE%%[<=>]*}"
+      "${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE_NAME}")
+  for pkgdir in ${fpm_dirs[@]}; do
+      fpminfo="$pkgdir/fpm-info.sh"
+      if [[ -e "$fpminfo" ]]; then
+          debug_echo "Loading fpm overrides from $fpminfo"
+          source "$fpminfo"
+          break
+      fi
+  done
   for pkg in "${build_depends[@]}"; do
       if [[ $TARGET =~ debian|ubuntu ]]; then
           pkg_deb=$(ls "$WORKSPACE/packages/$TARGET/$pkg_"*.deb | sort -rg | awk 'NR==1')

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


hooks/post-receive
--