Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

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

 ChangeLog                                  |    5 +++++
 var/lib/sorcery/modules/dl_handlers/dl_svn |    8 ++++++++
 var/lib/sorcery/modules/libsummon          |    5 ++++-
 var/lib/sorcery/modules/libtablet          |   12 ++++++++----
 4 files changed, 25 insertions(+), 5 deletions(-)

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

    libsummon: check also the sanity of signatures in source_sanity #342

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

    libtablet: fixed error checking in tablet_check_version_cache #378

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

    dl_svn: do a repo upgrade if necessary #336

diff --git a/ChangeLog b/ChangeLog
index 672f4eb..22c054c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * dl_svn: do a repo upgrade if necessary #336
+       * libtablet: fixed error checking in tablet_check_version_cache #378
+       * libsummon: check also the sanity of signatures in source_sanity #342
+
 2011-10-22 Bor Kraljič <pyrobor AT ver.si>
        * libmisc: use brace expansion to shorten the list of functions for 
hooks,
          changed run_hooks to be more generic
diff --git a/var/lib/sorcery/modules/dl_handlers/dl_svn 
b/var/lib/sorcery/modules/dl_handlers/dl_svn
index 4f6471c..818bf0e 100755
--- a/var/lib/sorcery/modules/dl_handlers/dl_svn
+++ b/var/lib/sorcery/modules/dl_handlers/dl_svn
@@ -50,6 +50,14 @@ function dl_svn_get () {
       svn_args="$svn_args --trust-server-cert"
     fi
 
+    local svn_format=$(head -1 $target/.svn/entries)
+    message "${MESSAGE_COLOR}Subversion working copy format: 
$svn_format${DEFAULT_COLOR}"
+    if (( ${svn_format:-100} <= 10 )); then
+      message "${MESSAGE_COLOR}Running svn upgrade...${DEFAULT_COLOR}"
+      echo svn upgrade $svn_args $target
+      svn upgrade $svn_args $target
+    fi
+
     if test -d $target; then
       message "${MESSAGE_COLOR}Running svn update...${DEFAULT_COLOR}"
       echo svn update $svn_args -r $SVN_TAG $target
diff --git a/var/lib/sorcery/modules/libsummon 
b/var/lib/sorcery/modules/libsummon
index 5e1cc24..57cbc8a 100755
--- a/var/lib/sorcery/modules/libsummon
+++ b/var/lib/sorcery/modules/libsummon
@@ -460,7 +460,10 @@ function source_sanity() {
      [[ "$1" != "${1%.tar.?}" ]] ||
      [[ "$1" != "${1%.tar}" ]] ||
      [[ "$1" != "${1%.zip}" ]] ||
-     [[ "$1" != "${1%.tgz}" ]]; then
+     [[ "$1" != "${1%.tgz}" ]] ||
+     [[ "$1" != "${1%.sig}" ]] ||
+     [[ "$1" != "${1%.sign}" ]] ||
+     [[ "$1" != "${1%.asc}" ]]; then
     local _type=$(file -bi "$1")
     if echo $_type | grep -iq "text/"; then
       message "$core_msg $_type"
diff --git a/var/lib/sorcery/modules/libtablet 
b/var/lib/sorcery/modules/libtablet
index 4cdbe60..e02b738 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -747,8 +747,9 @@ function tablet_create_version_cache() {
   local page_dir
   local spell version patchlevel security_patch updated
   local rc=0
+  local ok_spells=( $(get_all_spells_with_status ok) )
 
-  for spell in $(get_all_spells_with_status ok); do
+  for spell in ${ok_spells[@]}; do
     if tablet_find_spell_dir $spell page_dir; then
       tablet_get_version $page_dir version
       tablet_get_patchlevel $page_dir patchlevel
@@ -762,13 +763,16 @@ function tablet_create_version_cache() {
       error_message "${PROBLEM_COLOR}Creation of the cache failed at 
$spell," \
                     "please run cleanse --tablet and retry. If some spells" \
                     "have unfixable tablet pages, recast them.$DEFAULT_COLOR"
-      rc=1
       break
     fi
   done | sort > $file
 
-  [[ $rc == 1 ]] && rm $file
-  return $rc
+  # we can't set rc inside the loop, since it is in a subshell and
+  # the rc of break 13 still does not match what is documented in bash 4.2.24
+  if [[ ${#ok_spells[@]} != $(wc -l $file) ]]; then
+    rm $file
+    return 1
+  fi
 }
 
 #---------------------------------------------------------------------