From ec4eec30f4a28b2b815ed69cbce0e220c0d97c01 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 30 Sep 2008 18:19:52 +0200 Subject: [PATCH] Fix info dir file handling correctly this time. Reset xstow_args into the default value once the package has been stowned successfully. --HG-- extra : convert_revision : 74158cdc505ccc38d01120810e593215ed14ddaa --- pkgfs.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgfs.sh b/pkgfs.sh index 1410644911f..80c9a42ab62 100755 --- a/pkgfs.sh +++ b/pkgfs.sh @@ -554,6 +554,8 @@ stow_tmpl() local pkg="$1" local infodir_pkg="share/info/dir" local infodir_master="$PKGFS_MASTERDIR/share/info/dir" + local my_xstowargs= + local real_xstowargs="$xstow_args" [ -z "$pkg" ] && return 2 @@ -565,8 +567,8 @@ stow_tmpl() xstow_args="$xstow_args -i-file-in-dir $infodir_pkg" fi - $PKGFS_XSTOW_CMD -dir $PKGFS_DESTDIR -target $PKGFS_MASTERDIR \ - ${xstow_args} -pd-targets $PKGFS_MASTERDIR \ + $PKGFS_XSTOW_CMD ${xstow_args} -pd-targets $PKGFS_MASTERDIR \ + -dir $PKGFS_DESTDIR -target $PKGFS_MASTERDIR \ $PKGFS_DESTDIR/$pkg if [ "$?" -ne 0 ]; then echo "*** ERROR: couldn't create symlinks for \`$pkg' ***" @@ -575,6 +577,8 @@ stow_tmpl() echo ">>> Created \`$pkg' symlinks into master directory." fi + xstow_args="$real_xstowargs" + installed_tmpl_handler register $pkg }