From 493b87818bcb6bdf99886a29bbd3f778f6317d9d Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Mon, 10 Dec 2012 01:40:37 +0100 Subject: [PATCH] openmamba-netsrpms: correct "Already installed" message when installation fails due to an rpm build error --- openmamba-update/openmamba-netsrpms | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openmamba-update/openmamba-netsrpms b/openmamba-update/openmamba-netsrpms index 333d3cb..b4961ba 100755 --- a/openmamba-update/openmamba-netsrpms +++ b/openmamba-update/openmamba-netsrpms @@ -33,8 +33,6 @@ function check_if_already_installed() { rpm -q $1 &>/dev/null if [ $? -eq 0 ]; then notify-send -a $"Network software installation" -i $icon "$pckname" "$pckname: "$"already installed." - else - notify-send -a $"Network software installation" -i $icon "$pckname" $"There was an error installing"" $pckname!" fi } @@ -112,7 +110,7 @@ for pckname in $PACKAGES; do rpmbuild --rebuild $SRPM_PATH --define="%_rpmdir $tmpdir" if [ $? -gt 0 ]; then echo "$me: "$"error rebuilding \`$SRPM_PATH'."" "$"Aborting..." >&2 - check_if_already_installed $pckname + notify-send -a $"Network software installation" -i $icon "$pckname" $"There was an error installing"" $pckname!" exit 255 fi RPM_PATH=`find $tmpdir -name \*.rpm`