Fix prepending '=' to slotted atoms (Bug #213328)
authorfuzzyray <fuzzyray@gentoo.org>
Fri, 14 Mar 2008 03:21:03 +0000 (03:21 -0000)
committerfuzzyray <fuzzyray@gentoo.org>
Fri, 14 Mar 2008 03:21:03 +0000 (03:21 -0000)
svn path=/; revision=481

trunk/src/revdep-rebuild/revdep-rebuild

index 282dee5cac272fd5c2eccc855669ea31c466c851..592b8839fac4cbe9fb7cd81ab8c2eaff7ad75a14 100755 (executable)
@@ -808,7 +808,7 @@ get_exact_ebuilds() {
        elif [[ -r $LIST.3_rebuild && -s $LIST.3_rebuild ]]; then
                rebuildList=" $(<"$LIST.3_rebuild") "
                rebuildList=(${rebuildList//[[:space:]]obj[[:space:]]/ })
-               get_file_owner "${rebuildList[@]}" > $LIST.4_ebuilds
+               get_file_owner "${rebuildList[@]}" | sed 's/^/=/' > "$LIST.4_ebuilds"
                einfo "Generated new $LIST.4_ebuilds"
        else
                einfo 'Nothing to rebuild.'
@@ -921,15 +921,15 @@ echo
 # Clean up no longer needed environment variables
 unset SEARCH_DIRS SEARCH_DIRS_MASK LD_LIBRARY_MASK PORTAGE_ROOT
 
-[[ -r $LIST.5_order && -s $LIST.5_order ]] &&
-       REBUILD_LIST=($(<"$LIST.5_order")) ||
-       REBUILD_LIST=($(sort -u "$LIST.4_ebuilds"))
+if [[ -r $LIST.5_order && -s $LIST.5_order ]]; then
+       REBUILD_LIST=( $(<"$LIST.5_order") )
+       REBUILD_LIST="${REBUILD_LIST[@]/#/=}"
+else
+       REBUILD_LIST=$(sort -u "$LIST.4_ebuilds")
+fi
 
 trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
 
-REBUILD_LIST="${REBUILD_LIST[@]}"
-REBUILD_LIST="=${REBUILD_LIST//[[:space:]]/ =}"
-
 einfo 'All prepared. Starting rebuild'
 echo "emerge --oneshot ${EMERGE_OPTIONS[@]} $REBUILD_LIST"