[ARVADOS] updated: 1.2.0-206-gb48c1fe9a

Git user git at public.curoverse.com
Tue Oct 16 09:35:43 EDT 2018


Summary of changes:
 build/go-python-package-scripts/postinst | 7 +++----
 build/go-python-package-scripts/prerm    | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

       via  b48c1fe9a71d0243bbb162dd3706db27ffb177ee (commit)
      from  c4e3135187e0a2dd339a4e3dccb2441302e3f6ca (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 b48c1fe9a71d0243bbb162dd3706db27ffb177ee
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Oct 16 09:35:17 2018 -0400

    14344: Move "set -e" back to top.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/go-python-package-scripts/postinst b/build/go-python-package-scripts/postinst
index 095872fe2..ab2568ab9 100755
--- a/build/go-python-package-scripts/postinst
+++ b/build/go-python-package-scripts/postinst
@@ -3,11 +3,11 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+set -e
+
 # Detect rpm-based systems: the exit code of the following command is zero
 # on rpm-based systems
-/usr/bin/rpm -q -f /usr/bin/rpm >/dev/null 2>&1
-
-if [ "$?" = "0" ]; then
+if /usr/bin/rpm -q -f /usr/bin/rpm >/dev/null 2>&1; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
@@ -20,7 +20,6 @@ else
     prefix=/usr
 fi
 
-set -e
 case "${pkgtype}-${1}" in
     deb-configure | rpm-1)
         dest_dir="/lib/systemd/system"
diff --git a/build/go-python-package-scripts/prerm b/build/go-python-package-scripts/prerm
index b2908e2f3..c0f45d60c 100755
--- a/build/go-python-package-scripts/prerm
+++ b/build/go-python-package-scripts/prerm
@@ -3,11 +3,11 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
+set -e
+
 # Detect rpm-based systems: the exit code of the following command is zero
 # on rpm-based systems
-/usr/bin/rpm -q -f /usr/bin/rpm >/dev/null 2>&1
-
-if [ "$?" = "0" ]; then
+if /usr/bin/rpm -q -f /usr/bin/rpm >/dev/null 2>&1; then
     # Red Hat ("%{...}" is interpolated at package build time)
     pkg="%{name}"
     pkgtype=rpm
@@ -20,7 +20,6 @@ else
     prefix=/usr
 fi
 
-set -e
 case "${pkgtype}-${1}" in
     deb-remove | rpm-0)
         if [ -e /run/systemd/system ]; then

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list