From: Fabian Groffen Date: Fri, 8 Jan 2010 12:00:30 +0000 (-0000) Subject: Fix some broken lines, possibly fixing bug #299163 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c4d7f1798ec089406c8479fe6966780a9dc2bf14;p=portage.git Fix some broken lines, possibly fixing bug #299163 svn path=/main/branches/prefix/; revision=15177 --- diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index c36e01f6d..b1ebe2aaa 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -1159,8 +1159,7 @@ postinst_aix() { 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 @@ postinst_aix() { 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 }