Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (0679ca2b9ed1ef681032ceef40cd2310a88a28a9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (0679ca2b9ed1ef681032ceef40cd2310a88a28a9)
  • Date: Fri, 13 Aug 2010 05:08:10 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 9 +++++++++
usr/sbin/cast | 20 ++++++++++----------
usr/sbin/resurrect | 5 +++--
usr/sbin/scribe | 2 +-
var/lib/sorcery/modules/libcast | 2 +-
5 files changed, 24 insertions(+), 14 deletions(-)

New commits:
commit 0679ca2b9ed1ef681032ceef40cd2310a88a28a9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

scribe: show the correct grimoire url when updating all grimoires,
patch from Bor Kraljič

commit 7331c14524eac4dfdc516cafceedb82c56302389
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

ressurect: consolidate parameters before calling su, patch from
Edouard Klein

commit ce08454853abaef467ea71221de5576f8fa83966
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libcast: remove duplicate entries in the conflicts list

commit a5b1a48f7beb38a9012319911db3609655b47ef3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

cast: sort most of the spell list outputting, part of patch from
Ismael Luceno

diff --git a/ChangeLog b/ChangeLog
index c078fa2..707be25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * cast: sort most of the spell list outputting, part of patch from
+ Ismael Luceno
+ * libcast: remove duplicate entries in the conflicts list
+ * ressurect: consolidate parameters before calling su, patch from
+ Edouard Klein
+ * scribe: show the correct grimoire url when updating all grimoires,
+ patch from Bor Kraljič
+
2010-07-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libtrack, libdispel: use the correct whole-line option for grep

diff --git a/usr/sbin/cast b/usr/sbin/cast
index 0db05e8..5def4fb 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -328,7 +328,7 @@ function pass_one() {
for spell in $cannot_cast; do
grep -s "^$spell " $failure_reason_log ||
message "$spell"
- done | awkuniq | column
+ done | sort -u | column
rm -f $failure_reason_log

message "${DEFAULT_COLOR}"
@@ -371,7 +371,7 @@ function pass_one() {
message "${MESSAGE_COLOR}None of the spells have dependencies" \
"to cast:${DEFAULT_COLOR}"
message "---------------------------"
- message "${PROBLEM_COLOR}${parents}" | tr '[:blank:]' '\n' | column
+ message "${PROBLEM_COLOR}${parents}" | tr '[:blank:]' '\n' | sort |
column
message "${DEFAULT_COLOR}"
exit 1
fi
@@ -663,7 +663,7 @@ function pass_five() {

for item in `cat $SUCCESS_LIST 2>/dev/null`; do
message "$item"
- done | column
+ done | sort | column

set_term_title "Casting successful."
message "${DEFAULT_COLOR}"
@@ -676,7 +676,7 @@ function pass_five() {
message "---------------------------------------------${SPELL_COLOR}"
for item in `cat $CHECK_TRIGGERS_SUCCESS 2>/dev/null`; do
message "$item"
- done | column
+ done | sort | column
message "${DEFAULT_COLOR}"
fi

@@ -686,7 +686,7 @@ function pass_five() {
message "------------------------------------------${SPELL_COLOR}"
for item in `cat $CHECK_TRIGGERS_FAILURE 2>/dev/null`; do
message "$item"
- done | column
+ done | sort | column
message "${DEFAULT_COLOR}"
fi

@@ -699,7 +699,7 @@ function pass_five() {
message "${DEFAULT_COLOR}" #being paranoid
message "${MESSAGE_COLOR}Spells that have been dropped:"
message "------------------------------${QUERY_COLOR}"
- message "$NOT_CAST" | column
+ message "$NOT_CAST" | sort | column
message "${DEFAULT_COLOR}"
fi

@@ -709,7 +709,7 @@ function pass_five() {
message "-----------------------------------------------${QUERY_COLOR}"
for item in `cat $CONFLICT_LIST 2>/dev/null`; do
message "$item"
- done | column
+ done | sort | column
message "${DEFAULT_COLOR}"
fi

@@ -726,7 +726,7 @@ function pass_five() {
while read item; do
grep -s "^$item " $failure_reason_log ||
message "$item"
- done < $FAILED_LIST | awkuniq | column
+ done < $FAILED_LIST | sort -u | column
rm -f $failure_reason_log

set_term_title "Casting failed."
@@ -742,7 +742,7 @@ function pass_five() {
message "---------------------------------------${PROBLEM_COLOR}"
for item in `cat $INSTALL_QUEUE 2>/dev/null`; do
message "$item"
- done | column
+ done | sort | column
message "${DEFAULT_COLOR}"
rc=1
fi
@@ -760,7 +760,7 @@ function pass_five() {
message "${MESSAGE_COLOR}Cast deferred installing some configuration
files."
message "The following spells have new pending updates: "
message "----------------------------------------------$SPELL_COLOR"
- message "$deferred_list" | column
+ message "$deferred_list" | sort | column
message "${MESSAGE_COLOR}Please run confmeld to merge them into your
system."
message "$DEFAULT_COLOR"
fi
diff --git a/usr/sbin/resurrect b/usr/sbin/resurrect
index 5fa1e7c..1908633 100755
--- a/usr/sbin/resurrect
+++ b/usr/sbin/resurrect
@@ -311,10 +311,11 @@ function main() {
. /etc/sorcery/config
if [[ $UID -gt 0 ]]; then
# validate the parameters before su-ing, since we may still drop out
- verify_parameters $*
+ verify_parameters "$@"

echo "Enter the root password, please."
- exec su -c "resurrect $@" root
+ PARAMS=$(consolidate_params "$@")
+ exec su -c "resurrect $PARAMS" root
else
main "$@"
fi
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index dbd0ab8..2a65a71 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -712,7 +712,7 @@ function scribe_update() {

#include metadata
. $grimoire/GRIMOIRE
- message "Updating grimoire $grim from $from"
+ message "Updating grimoire $grim from $FROM_URL"
scribe_add_update_worker "$grimoire" "$FROM_URL" update ||
let rc++
done
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 90ec070..97765f2 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -139,7 +139,7 @@ function dispel_conflicts() {
return 0
fi

- for spell in $(< $conflict_list); do
+ for spell in $(sort -u $conflict_list); do
dispel --nosustain --noqueue $spell || return 1
done
}



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (0679ca2b9ed1ef681032ceef40cd2310a88a28a9), Jaka Kranjc, 08/13/2010

Archive powered by MHonArc 2.6.24.

Top of Page