aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2012-04-30 08:16:37 +0000
committerColin Guthrie <colin@mageia.org>2012-04-30 08:16:37 +0000
commitad044050808af89c5b7af92c657e2d6c44510d4c (patch)
treeb82085802ff9d1ac8af30c4390bfb9c6909e4da3
parent0e4fcb449c327a340134b74a17ea6bb29b55fb6b (diff)
downloadrpm-helper-ad044050808af89c5b7af92c657e2d6c44510d4c.tar
rpm-helper-ad044050808af89c5b7af92c657e2d6c44510d4c.tar.gz
rpm-helper-ad044050808af89c5b7af92c657e2d6c44510d4c.tar.bz2
rpm-helper-ad044050808af89c5b7af92c657e2d6c44510d4c.tar.xz
rpm-helper-ad044050808af89c5b7af92c657e2d6c44510d4c.zip
Do not allow error status to leak from script.
-rwxr-xr-xadd-service8
1 files changed, 5 insertions, 3 deletions
diff --git a/add-service b/add-service
index 40e3985..cee3b14 100755
--- a/add-service
+++ b/add-service
@@ -174,7 +174,9 @@ check_sysvinit_service() {
}
if [ $num = 1 ]; then
# First install mode
- [ "null" != "$units" ] && add_service
+ if [ "null" != "$units" ]; then
+ add_service
+ fi
else
# Upgrade mode.
reloaded=no
@@ -278,8 +280,8 @@ else
/bin/systemctl --quiet try-restart $iunit
done
fi
- else
- [ "null" != "$unit" ] && /bin/systemctl --quiet try-restart $unit
+ elif [ "null" != "$unit" ]; then
+ /bin/systemctl --quiet try-restart $unit
fi
done
elif [ -f /etc/rc.d/init.d/$srv ]; then