[gentoo-commits] portage r15177 - main/branches/prefix/bin

[Fabian Groffen (grobian)]

Author: grobian
Date: 2010-01-08 12:00:30 +0000 (Fri, 08 Jan 2010)
New Revision: 15177

Modified:
   main/branches/prefix/bin/misc-functions.sh
Log:
Fix some broken lines, possibly fixing bug #299163

Modified: main/branches/prefix/bin/misc-functions.sh
===================================================================
--- main/branches/prefix/bin/misc-functions.sh	2010-01-08 11:32:45 UTC (rev 15176)
+++ main/branches/prefix/bin/misc-functions.sh	2010-01-08 12:00:30 UTC (rev 15177)
@@ -1159,8 +1159,7 @@
 
 	local delmembers oldmembers libmetadir prunemembers=() prunedirs=()
 	for archive in "${all_archives[@]}"; do
-		[[ -r ${ROOT}${archive} && -w ${ROOT}${archive} ]] ||
-		chmod a+r,u+w "${ROOT}${archive}" || die "cannot chmod ${archive}"
+		[[ -r ${ROOT}${archive} && -w ${ROOT}${archive} ]] || chmod a+r,u+w "${ROOT}${archive}" || die "cannot chmod ${archive}"
 		delmembers= oldmembers=
 		for member in $(${ar} -X32_64 -t "${ROOT}${archive}"); do
 			contentmember="${archive%/*}/.${archive##*/}[${member}]"
@@ -1191,10 +1190,8 @@
 			eend $?
 		fi
 	done
-	[[ ${#prunedirs[@]} == 0 ]] ||
-	rm -rf "${prunedirs[@]}" || die "cannot prune ${prunedirs[@]}"
-	[[ ${#prunemembers[@]} == 0 ]] ||
-	rm -f "${prunemembers[@]}" || die "cannot prune ${contentmenbers[@]}"
+	[[ ${#prunedirs[@]} == 0 ]] || rm -rf "${prunedirs[@]}" || die "cannot prune ${prunedirs[@]}"
+	[[ ${#prunemembers[@]} == 0 ]] || rm -f "${prunemembers[@]}" || die "cannot prune ${contentmenbers[@]}"
 	return 0
 }