aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfuzzyray <fuzzyray@gentoo.org>2010-04-28 14:59:46 +0000
committerfuzzyray <fuzzyray@gentoo.org>2010-04-28 14:59:46 +0000
commit75f394240d26d42882de72e61b52fdfe35563c44 (patch)
tree07632adad243bf97088389a5eb8b1a5d18580a7d /src
parentRemove unused virtuals assignment. Causes deprecation warnings in latest por... (diff)
downloadgentoolkit-75f394240d26d42882de72e61b52fdfe35563c44.tar.gz
gentoolkit-75f394240d26d42882de72e61b52fdfe35563c44.tar.bz2
gentoolkit-75f394240d26d42882de72e61b52fdfe35563c44.zip
Restore follow symlinks option to find /var/db/pkg command. Make print statement python 3 compatible. Make EMERGE_DEFAULT_OPTIONS take precedence.
svn path=/branches/gentoolkit-0.2.4/; revision=778
Diffstat (limited to 'src')
-rwxr-xr-xsrc/revdep-rebuild/revdep-rebuild10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/revdep-rebuild/revdep-rebuild b/src/revdep-rebuild/revdep-rebuild
index de40085..c3df3b7 100755
--- a/src/revdep-rebuild/revdep-rebuild
+++ b/src/revdep-rebuild/revdep-rebuild
@@ -285,7 +285,7 @@ get_file_owner() {
# Add a space to the end of each object name to prevent false
# matches, for example /usr/bin/dia matching /usr/bin/dialog (bug #196460).
# The same for "${rpath} ".
- find /var/db/pkg -type f -name CONTENTS -print0 |
+ find -L /var/db/pkg -type f -name CONTENTS -print0 |
xargs -0 grep -m 1 -Fl -e "${*} " -e "${rpath} " -e "${mlib} " |
sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:'
}
@@ -548,7 +548,7 @@ verify_tmpdir() {
get_search_env() {
local new_env
local old_env
- local uid=$(python -c 'import os; import pwd; print pwd.getpwuid(os.getuid())[0]')
+ local uid=$(python -c 'import os; import pwd; print(pwd.getpwuid(os.getuid())[0])')
# Find a place to put temporary files
if [[ "$uid" == "root" ]]; then
local tmp_target="/var/cache/${APP_NAME}"
@@ -815,7 +815,7 @@ main_checks() {
progress $((++i)) $numFiles $target_file ||
progress $((++i)) $numFiles
done
- if [[ $SEARCH_BROKEN ]]; then
+ if [[ $SEARCH_BROKEN && -f $ERRORS_FILE ]]; then
# Look for missing version
while read target_file; do
echo "obj $target_file" >> "$BROKEN_FILE"
@@ -1113,7 +1113,7 @@ rebuild() {
trap - SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
einfo 'All prepared. Starting rebuild'
- echo "emerge --oneshot ${EMERGE_OPTIONS[@]} ${EMERGE_DEFAULT_OPTS} $REBUILD_LIST"
+ echo "emerge --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST"
is_real_merge && countdown 10
@@ -1122,7 +1122,7 @@ rebuild() {
# Run in background to correctly handle Ctrl-C
{
- emerge --oneshot ${EMERGE_OPTIONS[@]} ${EMERGE_DEFAULT_OPTS} $REBUILD_LIST <&6
+ emerge --oneshot ${EMERGE_DEFAULT_OPTS} ${EMERGE_OPTIONS[@]} $REBUILD_LIST <&6
echo $? > "$STATUS_FILE"
} &
wait