packages: lvm2/lvm2.spec - catch error, do not hide errors

glen glen at pld-linux.org
Tue Mar 20 13:30:27 CET 2012


Author: glen                         Date: Tue Mar 20 12:30:27 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- catch error, do not hide errors

---- Files affected:
packages/lvm2:
   lvm2.spec (1.187 -> 1.188) 

---- Diffs:

================================================================
Index: packages/lvm2/lvm2.spec
diff -u packages/lvm2/lvm2.spec:1.187 packages/lvm2/lvm2.spec:1.188
--- packages/lvm2/lvm2.spec:1.187	Sun Mar  4 11:43:39 2012
+++ packages/lvm2/lvm2.spec	Tue Mar 20 13:30:21 2012
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
 # TODO
 # - vgscan --ignorelocking failure creates /var/lock/lvm (even if /var is not yet mounted)
+# - Installed (but unpackaged) file(s) found:
+#   /etc/rc.d/init.d/clvmd
 # - --with-replicators (=internal/shared/none, default is none)?
 # - OCF agents?
 #
@@ -302,10 +304,9 @@
 
 # check if tools works
 for tool in initrd-lvm initrd-dmsetup; do
-	LVM_SYSTEM_DIR=$(pwd) ./${tool} help > /dev/null 2>&1
-	rc=$?
+	LVM_SYSTEM_DIR=$(pwd) ./$tool help && rc=$? || rc=$?
 	if [ $rc -gt 127 ]; then
-		echo "Unexpected failure (exit status: $rc) from $tool. Does this tool work?!" >&2
+		echo >&2 "Unexpected failure (exit status: $rc) from $tool. Does this tool work?!"
 		exit 1
 	fi
 done
@@ -339,7 +340,7 @@
 	--with-interface=ioctl \
 	--with-udev-prefix=/ \
 	--with-systemd_dir=%{systemdunitdir} \
-        %{!?with_selinux:--disable-selinux}
+	%{!?with_selinux:--disable-selinux}
 
 %{__make} -j1
 %{__make} -j1 -C libdm LIB_STATIC=libdevmapper.a
@@ -499,6 +500,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2012/03/20 12:30:21  glen
+- catch error, do not hide errors
+
 Revision 1.187  2012/03/04 10:43:39  arekm
 - make sure initrd tools work
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lvm2/lvm2.spec?r1=1.187&r2=1.188&f=u



More information about the pld-cvs-commit mailing list