@@ -638,7 +638,7 @@ function pass_five() {
if [ -s $CHECK_TRIGGERS_SUCCESS ] ; then
message "${DEFAULT_COLOR}"
message "${MESSAGE_COLOR}Spells that had a check_self trigger succeed:"
- message "-----------------------------------------------${SPELL_COLOR}"
+ message "---------------------------------------------${SPELL_COLOR}"
for item in `cat $CHECK_TRIGGERS_SUCCESS 2>/dev/null`; do
message "$item"
done | column
@@ -648,7 +648,7 @@ function pass_five() {
if [ -s $CHECK_TRIGGERS_FAILURE ] ; then
message "${DEFAULT_COLOR}"
message "${MESSAGE_COLOR}Spells that had a check_self trigger fail:"
- message "-----------------------------------------------${SPELL_COLOR}"
+ message "------------------------------------------${SPELL_COLOR}"
for item in `cat $CHECK_TRIGGERS_FAILURE 2>/dev/null`; do
message "$item"
done | column
@@ -703,7 +703,7 @@ function pass_five() {
if [ -s $INSTALL_QUEUE ] ; then
message "${MESSAGE_COLOR}The install queue is not empty, "
message "it still contains the following spells: "
- message "---------------------------------${PROBLEM_COLOR}"
+ message "---------------------------------------${PROBLEM_COLOR}"
for item in `cat $INSTALL_QUEUE 2>/dev/null`; do
message "$item"
done | column
@@ -723,7 +723,7 @@ function pass_five() {
if [[ $deferred_list ]]; then
message "${MESSAGE_COLOR}Cast deferred installing some configuration
files."
message "The following spells have new pending updates: "
- message "---------------------------------$SPELL_COLOR"
+ message "----------------------------------------------$SPELL_COLOR"
message "$deferred_list" | column
message "${MESSAGE_COLOR}Please run confmeld to merge them into your
system."
message "$DEFAULT_COLOR"
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 2bd9c51..dc703fe 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -1404,13 +1404,13 @@ function gaze_show_short_description() {
codex_set_current_spell_by_name $spell &&
echo $SHORT
) ||
- { message "No details found"
+ { message "No details found! Please file a bug!"
return 1
}
else
message "$spell -> no such spell"
- return 1
fi
+ if ! [[ $GAZE_VERBOSE == 0 ]]; then echo; fi
done
}
@@ -1432,12 +1432,16 @@ function gaze_show_long_description() {
codex_get_spell_description $SPELL_DIRECTORY
) ||
{
- message "No details found" &&
+ message "No details found! Please file a bug!" &&
return 1
}
else
message "$spell -> no such spell"
- return 1
+ fi
+ if [[ $GAZE_VERBOSE == 0 ]]; then
+ echo --- --- ---
+ else
+ echo
fi
done
}
diff --git a/var/lib/sorcery/excluded b/var/lib/sorcery/excluded
index 98e5b79..bd2ef48 100755
--- a/var/lib/sorcery/excluded
+++ b/var/lib/sorcery/excluded
@@ -1,5 +1,6 @@
^/dev
^/devices
+^/etc/.pwd.lock$
^/etc/X11/xdm/Xsession$
^/etc/cups/certs
^/etc/fstab$
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index d1ca054..94b7eac 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -155,9 +155,10 @@ function run_build() {
invoke_gcc2
optimize
- message -n "Installing in dir: "
+ message -n "Building in dir: "
pwd
message "$SPELL $VERSION"
+ message
run_spell_file BUILD build
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index f3295fe..1fab067 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -218,7 +218,7 @@ function install_pam_confs() {
local FILE
for FILE in `ls`; do
if ! [ -f $INSTALL_ROOT/etc/pam.d/$FILE ]; then
- cp $FILE $INSTALL_ROOT/etc/pam.d
+ install -g root -o root "$FILE" "$INSTALL_ROOT/etc/pam.d"
fi
done