Skip to Content.
Sympa Menu

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

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 (fffe3cd1301dea1f452633190653de207dfbf8af)
  • Date: Thu, 17 Apr 2008 04:04:12 -0500

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

ChangeLog | 4 ++
var/lib/sorcery/modules/libsorcery | 70
+++++++++++++++++++++----------------
2 files changed, 45 insertions(+), 29 deletions(-)

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

libsorcery: made verbose queuing use the version cache too and now all
the reasons are displayed, not just the first (only in the cache
code)

todo: make the old code display all the reasons too

diff --git a/ChangeLog b/ChangeLog
index 5b93167..15742b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: made verbose queuing use the version cache too and now
all
+ the reasons are displayed, not just the first (only in the cache
code)
+
2008-04-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* scribe.8: don't mention local grimoires for reindex-version,
nothing good
can come of it
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 71b933c..a0cde52 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -916,36 +916,44 @@ function update_install_queue() {
touch $tmp_queue

message "${CHECK_COLOR}Generating the list of spells to update...
${DEFAULT_COLOR} "
- if [[ $VERBOSE_QUEUING == on ]]; then
- count=0
- size=$(all_spell_status | wc -l)
- for line in `all_spell_status`; do
- progress_bar $count $size 50
- #0=spell, 1=date, 2=status, 3=version
- explode "$line" ":" "info"
- spell=${info[0]}
- curr_updated=${info[1]}
- status=${info[2]}
- curr_version=${info[3]}
-
- ( # do this in a subshell in case a spell mis-behaves and exits we
- # still want queueing to work
- if [[ "$status" == "installed" ]] &&
- codex_set_current_spell_by_name $spell; then
- does_spell_need_update_sub "$spell" "$curr_version" \
- "$curr_updated" "$tmp_queue"
- fi
- )
- let count++
- done
- clear_line
- else
tablet_check_version_cache $VERSION_STATUS || return 1
local grimoire
for grimoire in $(codex_get_all_grimoires); do
cat $grimoire/$VERSION_INDEX_FILE 2>/dev/null
done |
- awk -v i=$VERSION_STATUS '{
+ awk -v i=$VERSION_STATUS -v verbose=$VERBOSE_QUEUING '
+ # decide what to print - just the spell or also the reasons
+ function needs_update( reasons, diff) {
+ if (verbose == "on") {
+ # check SECURITY_PATCH first since it is the most important
+ diff = factor[4] - $4
+ if (diff > 0) {
+ if (diff > 1) {
+ reasons = reasons "Security update (" diff " times!)."
+ } else {
+ reasons = reasons "Security update."
+ }
+ }
+ if ($2 != factor[2]) {
+ reasons = reasons " New version (" factor[2] ")."
+ }
+ if ($3 < factor[3] ) {
+ reasons = reasons " Spell update."
+ }
+ if ($5 < factor[5]) {
+ reasons = reasons " UPDATED changed."
+ }
+ if (reasons != "") {
+ print $1, reasons
+ }
+ } else {
+ if ($2 != factor[2] || $3 < factor[3] || $4 < factor[4] || $5 <
factor[5]) {
+ print $1
+ }
+ }
+ }
+
+ {
if ( ! ($1 in map)) {
map[$1]=$0;
}
@@ -955,15 +963,20 @@ function update_install_queue() {
while (getline < i) {
if ($1 in map) {
split(map[$1], factor);
- if ($2 != factor[2] || $3 < factor[3] || $4 < factor[4] || $5 <
factor[5]) {
- print $1;
- }
+ needs_update();
} else {
# multiversioned spell - do it the old way
print $1 > "/dev/stderr";
}
}
} ' > $tmp_queue 2> $recheck_queue
+ if [[ $VERBOSE_QUEUING == on ]]; then
+ local spell message
+ while read spell message; do
+ message "$SPELL_COLOR$spell$DEFAULT_COLOR: $message"
+ done < $tmp_queue
+ sed -i 's,^\(\S*\)\s.*$,\1,' $tmp_queue
+ fi
if [[ -s $recheck_queue ]]; then
(
while read spell; do
@@ -977,7 +990,6 @@ function update_install_queue() {
)
rm $recheck_queue
fi
- fi
lock_file $INSTALL_QUEUE
rm -f $INSTALL_QUEUE
sort -u $tmp_queue > $INSTALL_QUEUE



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (fffe3cd1301dea1f452633190653de207dfbf8af), Jaka Kranjc, 04/17/2008

Archive powered by MHonArc 2.6.24.

Top of Page