[ARVADOS] updated: 1.3.0-2542-ge3958bed5

[Git user]

Summary of changes:
 build/run-library.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

       via  e3958bed53ae018ae2bb826e429d45c8046fecdb (commit)
      from  696df23123aac8b1eafb6eea6198de2143b8650f (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 e3958bed53ae018ae2bb826e429d45c8046fecdb
Author: Ward Vandewege <ward at jhvc.com>
Date:   Thu May 7 10:20:50 2020 -0400

    Bugfix: make the arvados-docker-cleaner packages install their systemd
    unit file in the correct directory.
    
    closes #16373
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index fd37f632b..beb23f563 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -638,7 +638,8 @@ fpm_build_virtualenv () {
   COMMAND_ARR+=('-n' "$PYTHON_PKG")
   COMMAND_ARR+=('-C' "build")
 
-  if [[ -e "$WORKSPACE/$PKG_DIR/$PKG.service" ]]; then
+  systemd_unit="$WORKSPACE/$PKG_DIR/$PKG.service"
+  if [[ -e "${systemd_unit}" ]]; then
     COMMAND_ARR+=('--after-install' "${WORKSPACE}/build/go-python-package-scripts/postinst")
     COMMAND_ARR+=('--before-remove' "${WORKSPACE}/build/go-python-package-scripts/prerm")
   fi
@@ -671,6 +672,12 @@ fpm_build_virtualenv () {
     COMMAND_ARR+=('--depends' "$i")
   done
 
+  # make sure the systemd service file ends up in the right place
+  # currently only used by arvados-docker-cleaner
+  if [[ -e "${systemd_unit}" ]]; then
+    COMMAND_ARR+=("usr/share/python3/dist/$PKG/share/doc/$PKG/$PKG.service=/lib/systemd/system/$PKG.service")
+  fi
+
   COMMAND_ARR+=("${fpm_args[@]}")
 
   # Make sure to install all our package binaries in /usr/bin.

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


hooks/post-receive
--