New commits:
commit d78067c0bb9fbb7e32fdf388053a90c9bf6b6cbc
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>
libtrack:is_castfs_installed added some output saying if it is enabled or
disabled also quieted all the output that might come about from calling it
diff --git a/ChangeLog b/ChangeLog
index 255f0f8..d8f8e2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2006-11-30 David Brown <dmlb2000 AT gmail.com>
* libtrack: forgot to run stage root files list through exclude filter
+ * libtrack: is_castfs_installed quieted all the errors and output
+ messages saying if it's enabled or disabled
2006-11-30 Andrew Stitt <astitt AT sourcemage.org>
* cleanse: fix typo, missing ;;
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 7b42c79..2824bd6 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -133,10 +133,18 @@ function real_devoke_installwatch() {
function is_castfs_installed()
{
- if which castfs && ( modprobe fuse || grep -q '^nodev[[:space:]]*fuse$'
/proc/filesystems ) && [ -c /dev/fuse ]
+ local loc
+ if smgl_which castfs loc >/dev/null 2>&1 &&
+ (
+ modprobe fuse > /dev/null 2>&1 ||
+ grep -q '^nodev[[:space:]]*fuse$' /proc/filesystems
+ ) &&
+ [[ -c /dev/fuse ]]
then
+ message "${MESSAGE_COLOR}staging enabled${DEFAULT_COLOR}"
return 0
else
+ message "${MESSAGE_COLOR}staging disabled${DEFAULT_COLOR}"
return 1
fi
}
[SM-Commit] GIT changes to master sorcery by David Brown (d78067c0bb9fbb7e32fdf388053a90c9bf6b6cbc),
David Brown, 11/30/2006