[ARVADOS] updated: 1.3.0-148-gea8cb5028

[Git user]

Summary of changes:
 build/run-library.sh          | 6 ++++++
 sdk/pam/lib/libpam_arvados.py | 2 ++
 2 files changed, 8 insertions(+)

       via  ea8cb50283db94e052a6d525fd858ce23086fa1f (commit)
      from  2666c3b726d190511f072db9e6606a1a99936968 (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 ea8cb50283db94e052a6d525fd858ce23086fa1f
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Mon Feb 4 08:36:00 2019 -0500

    9945: Backwards compatibility fix for libpam-arvados
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 4f7c5b965..9df62adee 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -596,6 +596,12 @@ fpm_build_virtualenv () {
     done
   fi
 
+  # the libpam module should place this file in the historically correct place
+  # so as not to break backwards compatibility
+  if [[ -e "$WORKSPACE/$PKG_DIR/dist/build/usr/share/python2.7/dist/libpam-arvados/lib/security/libpam_arvados.py" ]]; then
+    COMMAND_ARR+=("usr/share/$python/dist/$PYTHON_PKG/data/lib/security/libpam_arvados.py=/usr/data/lib/security/")
+  fi
+
   COMMAND_ARR+=(".")
 
   FPM_RESULTS=$("${COMMAND_ARR[@]}")
diff --git a/sdk/pam/lib/libpam_arvados.py b/sdk/pam/lib/libpam_arvados.py
index 2c0045d6a..7c3406d30 100644
--- a/sdk/pam/lib/libpam_arvados.py
+++ b/sdk/pam/lib/libpam_arvados.py
@@ -2,4 +2,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+import sys
+sys.path.append('/usr/share/python2.7/dist/libpam-arvados/lib/python2.7/site-packages')
 from arvados_pam import *

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


hooks/post-receive
--