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                         |    9 +++++++++
 usr/sbin/sorcery                  |    2 +-
 var/lib/sorcery/modules/libmisc   |    2 +-
 var/lib/sorcery/modules/libtablet |    4 +++-
 var/lib/sorcery/modules/libunpack |    4 ++--
 5 files changed, 16 insertions(+), 5 deletions(-)

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

    sorcery: only look at spec files when scanning architectures, fixes #438
    
    grep 2.11 changelog:
      grep no longer silently suppresses errors when reading a directory
      as if it were a text file.  For example, "grep x ." now reports a
      read error on most systems; formerly, it ignored the error.
      [bug introduced in grep-2.5]
    
    this exposed a bug, since we were doing exactly that without suppression

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

    libtablet: added third option to the broken version cache warning
    
    fixes #378
    
    Conflicts:
        ChangeLog

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

    libunpack, libmisc: also detect old style xz archives #347
    
    fixes #347

diff --git a/ChangeLog b/ChangeLog
index 9e49a74..cb053fe 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * sorcery: only look at spec files when scanning architectures #438
+
+2012-06-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libtablet: added third option to the broken version cache warning
+
+2012-06-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libunpack, libmisc: also detect old style xz archives #347
+
 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
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 4b4f30d..75b8f09 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -685,7 +685,7 @@ architecture_menu() {
   # same name), it reverses the output from tac so that the first archspecs
   # found are the last added to the hash table and thus are prefered over
   # ones found later
-  for  SPECFILE  in  $(find  $ARCH_SPECS  -not  -name '*~'|tac); do
+  for  SPECFILE  in  $(find $ARCH_SPECS -type f -not -name '*~' | tac); do
     if  test -x  "$SPECFILE"   && grep  -q  "CPUNAME"  $SPECFILE; then
       smgl_basename "$SPECFILE" specname
       hash_put archspec_hash $specname $SPECFILE
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 55a56db..dbafef0 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1627,7 +1627,7 @@ function show_file() {
               fi ;;
       bzip2*) bzcat "$file" | $PAGER ;;
       gzip*) gzip -cd "$file" | $PAGER ;;
-   XZ*|LZMA*) xz -cd "$file" | $PAGER ;;
+      xz*|XZ*|LZMA*) xz -cd "$file" | $PAGER ;;
       7-zip*) 7z -d "$file" | $PAGER ;;
           *) message "Unknown file type."
               return 1 ;;
diff --git a/var/lib/sorcery/modules/libtablet 
b/var/lib/sorcery/modules/libtablet
index e02b738..9950187 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -762,7 +762,9 @@ function tablet_create_version_cache() {
     else
       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"
+                    "have unfixable tablet pages, recast them.\n" \
+                    "If you're ok with slower queueing of everything just 
run:" \
+                    "export OLD_QUEUING_METHOD=1 and you won't be bothered 
again.$DEFAULT_COLOR"
       break
     fi
   done | sort > $file
diff --git a/var/lib/sorcery/modules/libunpack 
b/var/lib/sorcery/modules/libunpack
index 0b883a6..773bd54 100755
--- a/var/lib/sorcery/modules/libunpack
+++ b/var/lib/sorcery/modules/libunpack
@@ -204,7 +204,7 @@ function uncompress_core() {
             Zip)  cat           "$1"  ;;
             RPM)  rpmunpack  <  "$1" | gzip  -cd    ;;
             tar)  cat           "$1"  ;;
-             XZ)  xz -cdf "$1" ;;
+          xz|XZ)  xz -cdf "$1" ;;
            LZMA)  xz -cdf "$1" ;;
           7-zip)  cat "$1" ;; # 7z supports stdout, but it unpacks at the 
same time
               *)  cat           "$1"  ;;
@@ -227,7 +227,7 @@ function unpack_core() {
   debug "libgrimoire" "unpack_core - $*"
 
   case  "$2"  in
-            bzip2|gzip|compress*|tar|XZ|LZMA)
+            bzip2|gzip|compress*|tar|XZ|xz|LZMA)
                     if real_list_find "$3" same-permissions; then
                       tar -xf /dev/stdin 2> /dev/null
                     else