[ARVADOS-DEV] updated: 3d595c9b4cda969d75715395a29057e1740568e3

git at public.curoverse.com git at public.curoverse.com
Wed Aug 12 22:36:42 EDT 2015


Summary of changes:
 jenkins/run-build-packages.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

       via  3d595c9b4cda969d75715395a29057e1740568e3 (commit)
      from  69e7600c1d70c485325a3b2c9d818ac2e1e1084d (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 3d595c9b4cda969d75715395a29057e1740568e3
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Aug 12 22:36:13 2015 -0400

    6934: Build libpam-arvados only for targets that have libpam-python.

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index b1ff4be..58c63ac 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -563,9 +563,11 @@ rm -rf "$WORKSPACE/sdk/python/build"
 fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Python SDK" --deb-recommends=git
 
 # The PAM module
-cd $WORKSPACE/packages/$TARGET
-rm -rf "$WORKSPACE/sdk/pam/build"
-fpm_build $WORKSPACE/sdk/pam libpam-arvados 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/pam/arvados_pam.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=PAM module for authenticating shell logins using Arvados API tokens" --depends libpam-python
+if [[ $TARGET =~ debian|ubuntu ]]; then
+    cd $WORKSPACE/packages/$TARGET
+    rm -rf "$WORKSPACE/sdk/pam/build"
+    fpm_build $WORKSPACE/sdk/pam libpam-arvados 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/pam/arvados_pam.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=PAM module for authenticating shell logins using Arvados API tokens" --depends libpam-python
+fi
 
 # The FUSE driver
 # Please see comment about --no-python-fix-name above; we stay consistent and do

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list