sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (2fce1b7b7ad25757bc4c38c35e08c49cb6cf4ff1)
- From: Jaka Kranjc <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (2fce1b7b7ad25757bc4c38c35e08c49cb6cf4ff1)
- Date: Thu, 22 Sep 2011 11:42:10 -0500
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
ChangeLog | 1 +
var/lib/sorcery/modules/libtrack | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 2fce1b7b7ad25757bc4c38c35e08c49cb6cf4ff1
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
libtrack: detect symlinks in real_invoke_stage_root, fixes #16
diff --git a/ChangeLog b/ChangeLog
index a52ccd0..0a8fb52 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2011-09-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* gaze: make show_from print the filename again
+ * libtrack: detect symlinks in real_invoke_stage_root #16
2011-09-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libstage: ensure hardlinks are preserved #15981
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 0b5762a..17792a2 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -102,7 +102,13 @@ function real_invoke_stage_root()
# this forks and daemonizes so it will exit you simply unmount the dir to
stop the process
for dir in ${CASTFS_UNSTAGED_PATHS} ${LOCAL_IGNORE_DIRS}
do
- CASTFS_IGNORE_LIST="${CASTFS_IGNORE_LIST} -o ignore=$dir"
+ if [[ -h $dir ]]; then
+ CASTFS_IGNORE_LIST="${CASTFS_IGNORE_LIST} -o ignore=$(readlink $dir)"
+ elif [[ -d $dir ]]; then
+ CASTFS_IGNORE_LIST="${CASTFS_IGNORE_LIST} -o ignore=$dir"
+ else
+ debug "libtrack" "User wanted $FUNCNAME to treat $dir as a directory!"
+ fi
done &&
castfs "${STAGE_DIRECTORY}/MOUNT" -o "stage=${STAGE_DIRECTORY}/TRANSL"
$CASTFS_IGNORE_LIST &&
for dir in /dev /dev/pts /proc /sys
- [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (2fce1b7b7ad25757bc4c38c35e08c49cb6cf4ff1), Jaka Kranjc, 09/22/2011
Archive powered by MHonArc 2.6.24.