packages: builder - kill some long if-branches

[glen]

Author: glen                         Date: Sat Dec  4 19:22:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- kill some long if-branches

---- Files affected:
packages:
   builder (1.637 -> 1.638) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.637 packages/builder:1.638
--- packages/builder:1.637	Tue Nov 30 07:28:48 2010
+++ packages/builder	Sat Dec  4 20:22:34 2010
@@ -2436,47 +2436,51 @@
 case "$COMMAND" in
 	"show_bconds")
 		init_builder
-		if [ -n "$SPECFILE" ]; then
-			get_spec > /dev/null
-			parse_spec
-			set_bconds_values
-			display_bconds
+		if [ -z "$SPECFILE" ]; then
+			Exit_error err_no_spec_in_cmdl
 		fi
+		get_spec > /dev/null
+		parse_spec
+		set_bconds_values
+		display_bconds
 		;;
 	"show_bcond_args")
 		init_builder
-		if [ -n "$SPECFILE" ]; then
-			get_spec > /dev/null
-			parse_spec
-			set_bconds_values
-			echo "$BCOND"
+		if [ -z "$SPECFILE" ]; then
+			Exit_error err_no_spec_in_cmdl
 		fi
+		get_spec > /dev/null
+		parse_spec
+		set_bconds_values
+		echo "$BCOND"
 		;;
 	"show_avail_bconds")
 		init_builder
-		if [ -n "$SPECFILE" ]; then
-			get_spec > /dev/null
-			parse_spec
-			local bcond_avail=$(find_spec_bcond $SPECFILE)
-			local opt bcond bconds
-			for opt in $bcond_avail; do
-				case "$opt" in
-				without_*)
-					bcond=${opt#without_}
-					bconds="$bconds $bcond"
-					;;
-				with_*)
-					bcond=${opt#with_}
-					bconds="$bconds $bcond"
-					;;
-				*)
-					echo >&2 "ERROR: unexpected '$opt' in show_avail_bconds"
-					exit 1
-					;;
-				esac
-			done
-			echo $bconds
+		if [ -z "$SPECFILE" ]; then
+			Exit_error err_no_spec_in_cmdl
 		fi
+
+		get_spec > /dev/null
+		parse_spec
+		local bcond_avail=$(find_spec_bcond $SPECFILE)
+		local opt bcond bconds
+		for opt in $bcond_avail; do
+			case "$opt" in
+			without_*)
+				bcond=${opt#without_}
+				bconds="$bconds $bcond"
+				;;
+			with_*)
+				bcond=${opt#with_}
+				bconds="$bconds $bcond"
+				;;
+			*)
+				echo >&2 "ERROR: unexpected '$opt' in show_avail_bconds"
+				exit 1
+				;;
+			esac
+		done
+		echo $bconds
 
 		;;
 	"build" | "build-binary" | "build-source" | "build-prep" | "build-build" | "build-install" | "build-list")
================================================================

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