Skip to Content.
Sympa Menu

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

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 (f9b0b32f016326172df963cd10f67f1387cab425)
  • Date: Sat, 5 Jul 2008 04:54:54 -0500

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

ChangeLog | 5 ++
var/lib/sorcery/modules/libqueue | 69
+++++++++++++++++++--------------------
2 files changed, 39 insertions(+), 35 deletions(-)

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

libqueue: made the old method print all the reasons for queuing. This
way the behaviour is consistent with the new method and
multiversioned
spells have all the reasons printed

diff --git a/ChangeLog b/ChangeLog
index 97266bd..0662597 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libqueue: made the old method print all the reasons for queuing.
This
+ way the behaviour is consistent with the new method and
multiversioned
+ spells have all the reasons printed
+
2008-07-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libmisc: removed older, commented-out versions of
config_[gs]et_option

diff --git a/var/lib/sorcery/modules/libqueue
b/var/lib/sorcery/modules/libqueue
index 0be9a35..27dcea3 100755
--- a/var/lib/sorcery/modules/libqueue
+++ b/var/lib/sorcery/modules/libqueue
@@ -232,44 +232,43 @@ function does_spell_need_update_sub() {
local curr_updated=$3
local tmp_queue=$4
local message="$SPELL_COLOR$spell$DEFAULT_COLOR:"
- if [[ $VERSION != $curr_version ]] ; then
- if [[ $VERBOSE_QUEUING == on ]]; then
- clear_line
- message "$message New version ($VERSION)."
- fi
- echo $spell >> $tmp_queue
- return 0
- else
- curr_patchlevel=0
- curr_sec_patch=0
- if tablet_find_spell_dir $spell page_dir ; then
- curr_updated=0
- tablet_get_updated $page_dir curr_updated
- tablet_get_patchlevel $page_dir curr_patchlevel
- tablet_get_security_patch $page_dir curr_sec_patch
- fi
- local diff=$(( ${SECURITY_PATCH:-0} - $curr_sec_patch ))
- if (( $diff > 0 )); then
- if (( $diff > 1 )); then
- message="$message Security update ($diff times!)."
- else
- message="$message Security update."
- fi
- elif (( "${PATCHLEVEL:-0}" > "$curr_patchlevel" )); then
- message="$message Spell update."
- elif (( "${UPDATED:-0}" > "${curr_updated:-0}" )); then
- message="$message UPDATED changed."
+
+ local curr_patchlevel=0
+ local curr_sec_patch=0
+ if tablet_find_spell_dir $spell page_dir; then
+ curr_updated=0
+ tablet_get_updated $page_dir curr_updated
+ tablet_get_patchlevel $page_dir curr_patchlevel
+ tablet_get_security_patch $page_dir curr_sec_patch
+ fi
+
+ local diff=$(( ${SECURITY_PATCH:-0} - $curr_sec_patch ))
+ if (( $diff > 0 )); then
+ if (( $diff > 1 )); then
+ message="$message Security update ($diff times!)."
else
- return 1
+ message="$message Security update."
fi
- if [[ $VERBOSE_QUEUING == on ]]; then
- clear_line
- message "$message"
- fi
- echo $spell >> $tmp_queue
- return 0
fi
- return 1
+ if [[ $VERSION != $curr_version ]]; then
+ message="$message New version ($VERSION)."
+ fi
+ if (( "${PATCHLEVEL:-0}" > "$curr_patchlevel" )); then
+ message="$message Spell update."
+ fi
+ if (( "${UPDATED:-0}" > "${curr_updated:-0}" )); then
+ message="$message UPDATED changed."
+ fi
+ if [[ $message == "$SPELL_COLOR$spell$DEFAULT_COLOR:" ]]; then
+ # no updates found
+ return 1
+ fi
+ if [[ $VERBOSE_QUEUING == on ]]; then
+ clear_line
+ message "$message"
+ fi
+ echo $spell >> $tmp_queue
+ return 0
}

#---------------------------------------------------------------------



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (f9b0b32f016326172df963cd10f67f1387cab425), Jaka Kranjc, 07/05/2008

Archive powered by MHonArc 2.6.24.

Top of Page