diff options
| author | fuzzyray <fuzzyray@gentoo.org> | 2008-03-14 03:21:03 +0000 |
|---|---|---|
| committer | fuzzyray <fuzzyray@gentoo.org> | 2008-03-14 03:21:03 +0000 |
| commit | c924edafe63bec31bdfe87643ee65142a90820d9 (patch) | |
| tree | 4ff125899ed7894875ac0bafe0ededf77bc4f7a6 /trunk | |
| parent | 377c25f70549073dbe7adc680ed0b863120c2a45 (diff) | |
| download | gentoolkit-c924edafe63bec31bdfe87643ee65142a90820d9.tar.gz | |
Fix prepending '=' to slotted atoms (Bug #213328)
svn path=/; revision=481
Diffstat (limited to 'trunk')
| -rwxr-xr-x | trunk/src/revdep-rebuild/revdep-rebuild | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/trunk/src/revdep-rebuild/revdep-rebuild b/trunk/src/revdep-rebuild/revdep-rebuild index 282dee5..592b883 100755 --- a/trunk/src/revdep-rebuild/revdep-rebuild +++ b/trunk/src/revdep-rebuild/revdep-rebuild @@ -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" |