[ARVADOS] updated: 1.1.3-258-ge6f3620

[Git user]

Summary of changes:
 build/go-python-package-scripts/postinst | 1 -
 build/go-python-package-scripts/prerm    | 1 -
 build/run-library.sh                     | 6 +++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

       via  e6f36206268c5ea4748f9ef1357bb936b2a2b1a3 (commit)
      from  bd7f658eeec2eb2f40810a6e7779f78dc9609fed (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 e6f36206268c5ea4748f9ef1357bb936b2a2b1a3
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Fri Mar 23 13:58:33 2018 -0300

    13200:test to remove prefix on python
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/go-python-package-scripts/postinst b/build/go-python-package-scripts/postinst
index 6d303f2..cc63f35 100755
--- a/build/go-python-package-scripts/postinst
+++ b/build/go-python-package-scripts/postinst
@@ -9,7 +9,6 @@ if [ "%{name}" != "%\{name\}" ]; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
-    prefix="${RPM_INSTALL_PREFIX}"
 else
     # Debian
     script="$(basename "${0}")"
diff --git a/build/go-python-package-scripts/prerm b/build/go-python-package-scripts/prerm
index d840ee1..49bd7fc 100755
--- a/build/go-python-package-scripts/prerm
+++ b/build/go-python-package-scripts/prerm
@@ -9,7 +9,6 @@ if [ "%{name}" != "%\{name\}" ]; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
-    prefix="${RPM_INSTALL_PREFIX}"
 else
     # Debian
     script="$(basename "${0}")"
diff --git a/build/run-library.sh b/build/run-library.sh
index 2e441e4..238d6d6 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -50,7 +50,7 @@ version_from_git() {
         return
     fi
 
-    local git_ts git_hash
+    local git_ts git_hash prefix
     if [[ -n "$1" ]] ; then
         prefix="$1"
     else
@@ -391,6 +391,8 @@ fpm_build () {
           python=python2.7
           set -- "$@" --python-bin python2.7 \
               --python-easyinstall "$EASY_INSTALL2" \
+              --python-package-name-prefix "$PYTHON2_PKG_PREFIX" \
+              --prefix "$PYTHON2_PREFIX" \
               --python-install-lib "$PYTHON2_INSTALL_LIB" \
               --python-install-data . \
               --exclude "${PYTHON2_INSTALL_LIB#/}/tests" \
@@ -405,6 +407,8 @@ fpm_build () {
           python=python3
           set -- "$@" --python-bin python3 \
               --python-easyinstall "$EASY_INSTALL3" \
+              --python-package-name-prefix "$PYTHON3_PKG_PREFIX" \
+              --prefix "$PYTHON3_PREFIX" \
               --python-install-lib "$PYTHON3_INSTALL_LIB" \
               --python-install-data . \
               --exclude "${PYTHON3_INSTALL_LIB#/}/tests" \

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


hooks/post-receive
--