packages: builder - no extra subshells

glen glen at pld-linux.org
Fri Oct 28 11:48:35 CEST 2011


Author: glen                         Date: Fri Oct 28 09:48:35 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no extra subshells

---- Files affected:
packages:
   builder (1.663 -> 1.664) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.663 packages/builder:1.664
--- packages/builder:1.663	Tue Oct 25 11:42:01 2011
+++ packages/builder	Fri Oct 28 11:48:30 2011
@@ -212,7 +212,7 @@
 
 GETLOCAL="cp -a"
 
-if (rpm --version 2>&1 | grep -q '4.0.[0-2]'); then
+if rpm --version 2>&1 | grep -q '4.0.[0-2]'; then
 	RPM="rpm"
 	RPMBUILD="rpm"
 else
@@ -618,7 +618,7 @@
 	cd $PACKAGE_DIR
 	cache_rpm_dump
 
-	if (rpm_dump | grep -qEi ":.*nosource.*1"); then
+	if rpm_dump | grep -qEi ":.*nosource.*1"; then
 		FAIL_IF_NO_SOURCES="no"
 	fi
 
@@ -758,7 +758,7 @@
 
 	if [ "$NOCVSSPEC" != "yes" ]; then
 		if [ ! -s CVS/Root -a "$NOCVSSPEC" != "yes" ]; then
-			echo "Warning: No CVS access defined - using local .spec file"
+			echo "Warning: No CVS access defined in $(pwd)- using local .spec file"
 			NOCVSSPEC="yes"
 		fi
 
@@ -1647,7 +1647,7 @@
 	# w32codec-installer license_agreement
 	# php +mysqli
 	# ---
-	if ([ -f $HOME/.bcondrc ] || ([ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ])); then
+	if [ -f $HOME/.bcondrc ] || ([ -n $HOME_ETC ] && [ -f $HOME_ETC/.bcondrc ]); then
 		:
 	else
 		return
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.663&r2=1.664&f=u



More information about the pld-cvs-commit mailing list