Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

GIT changes to test-1.15 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

 ChangeLog                                  |   11 +++++++++++
 etc/sorcery/version                        |    2 +-
 var/lib/sorcery/modules/dl_handlers/dl_svn |    8 ++++++++
 var/lib/sorcery/modules/libcodex           |    3 ++-
 var/lib/sorcery/modules/libresurrect       |    2 +-
 var/lib/sorcery/modules/libsummon          |    5 ++++-
 var/lib/sorcery/modules/libtablet          |   12 ++++++++----
 7 files changed, 35 insertions(+), 8 deletions(-)

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

    1.15.2-rc1

commit fc0957e603dbba826fa84ab839e7ce01a1272fd8
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 25589ac9245b9bc42d8f0f402e8a0cc9dcaa7c59
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 d4a8b4a4b2cb12db31c67ba7274f2da46a6b0bdc
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    dl_svn: do a repo upgrade if necessary #336

commit d1d81f9a1adf8c5cbdd23aafea4cf30ab1909f59
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    libcodex: wrap long description to the width of the terminal

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

    libressurect: clarified a merge message
    based on c664ae494729b8

diff --git a/ChangeLog b/ChangeLog
index b7e2217..9e49a74 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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-17 Bor Kraljič <pyrobor AT ver.si>
+       * libcodex: wrap long description to the width of the terminal
+
+2011-10-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libressurect: clarified a merge message
+
 2011-10-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * libdownload: print the original argument if cmd is unset
 
diff --git a/etc/sorcery/version b/etc/sorcery/version
index b927744..0542add 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.15.1-rc1
+1.15.2-rc1
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/libcodex 
b/var/lib/sorcery/modules/libcodex
index b3e9c05..176225a 100755
--- a/var/lib/sorcery/modules/libcodex
+++ b/var/lib/sorcery/modules/libcodex
@@ -1028,7 +1028,8 @@ function codex_find_spell_or_section_by_name()  {
 ##
 #---------------------------------------------------------------------
 function codex_get_spell_description()  {
-  codex_is_directory_a_spell  "$1"  &&  .  "$1/DETAILS"
+  local width=$(stty size | cut -d' ' -f2)
+  codex_is_directory_a_spell  "$1"  &&  .  "$1/DETAILS" | fmt -w $width -s
 }
 
 #---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libresurrect 
b/var/lib/sorcery/modules/libresurrect
index 7daae48..931ec62 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -532,7 +532,7 @@ function real_handle_changed_config() {
     message "(0) trash $to and install over it"
     message "(1) backup $to to $to.$savetime.old, install the new file in 
its place"
     message "(2) leave $to in its place, copy the new file to 
$to.$savetime.new"
-    message "(3) do nothing"
+    message "(3) do nothing - leave $to in its place, discard new file"
     message "(4) see a diff between $to and the new file"
     # TODO: someday add an option to use an external merge tool
 
diff --git a/var/lib/sorcery/modules/libsummon 
b/var/lib/sorcery/modules/libsummon
index 3de9d2b..49fba3c 100755
--- a/var/lib/sorcery/modules/libsummon
+++ b/var/lib/sorcery/modules/libsummon
@@ -457,7 +457,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
 }
 
 #---------------------------------------------------------------------