[SM-Commit] GIT changes to test-1.14 sorcery by Jaka Kranjc (667d0163dac3626f8f4d2ff31a83895a32ef4ff7)

Jaka Kranjc scm at sourcemage.org
Mon Sep 8 16:15:21 EDT 2008


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

 ChangeLog                               |   15 +++++++++++++++
 etc/sorcery/version                     |    2 +-
 usr/sbin/cast                           |    4 +++-
 usr/sbin/cleanse                        |   10 +++++-----
 var/lib/sorcery/modules/libcrossinstall |    2 +-
 var/lib/sorcery/modules/libgpg          |    3 +++
 var/lib/sorcery/modules/libgrimoire     |    8 +++++++-
 7 files changed, 35 insertions(+), 9 deletions(-)

New commits:
commit 667d0163dac3626f8f4d2ff31a83895a32ef4ff7
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    1.14.2-rc3

commit 799a4c25c1b8fe418c18e4aa2b99981750eca4b7
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    * cast: don't resurrect the spell if it needs an update
    
    (part of d6cc8d753c78ddbd5ecee6ad352e90d7cca718a2)

commit 13d38764dc264a08e84305410482f2d886d72e07
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    libgpg: added another message suggesting to update sorcery-pubkeys if
          things go wrong; it is displayed if the spell needs an update #13752
    
    (cherry-picked from commit 0f5ee4c486741ca954a3c804aebe0d945fa83271)

commit f60e95b3235bb62700a679e695d856e5cb273a4d
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    libgrimoire: fixed install_desktop_files for staging
    
    (cherry-picked from commit f4d16e322aa95b4fb78eccc134fce79c48ef65ab)

commit dcb00314dbfb84244137f73b6a4a1198ffde659d
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    libcrossinstall: fixed a help description for install_root_menu
    
    (cherry-picked from commit 050d5a7f93cf082f0cf8ac6cdeec5496903b60cb)

commit 6e6d54d1be5431eae1b824801fb3e696e6cafc3c
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    cleanse: simplified a few lines and made the symlink check locale
          agnostic
    
    (cherry-picked from commit aa7c9ff21a1dd0fef4f0b4ffb91502aaf35ae744)

diff --git a/ChangeLog b/ChangeLog
index 249efad..f586e92 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-09-06 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* libgpg: added another message suggesting to update sorcery-pubkeys if
+	  things go wrong; it is displayed if the spell needs an update #13752
+	* cast: don't resurrect the spell if it needs an update
+
+2008-09-05 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* libgrimoire: fixed install_desktop_files for staging
+
+2008-09-05 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* libcrossinstall: fixed a help description for install_root_menu
+
+2008-09-05 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* cleanse: simplified a few lines and made the symlink check locale
+	  agnostic and single-spaced
+
 2008-09-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* libtablet: fixed broken repair file handling - a nonexisting tablet
 	  file caused the function to use the previous found tablet file,
diff --git a/etc/sorcery/version b/etc/sorcery/version
index a0808ab..3c31f82 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.14.2-rc2
+1.14.2-rc3
diff --git a/usr/sbin/cast b/usr/sbin/cast
index fe88027..f9bd26c 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -567,7 +567,9 @@ function pass_four()  {
     if [[ ! $VERSION ]] ; then
       message "Can't find spell version for some reason, is $SPELL a spell?"
     else
-      can_resurrect $SPELL $VERSION &> /dev/null && do_resurrect=yes
+      can_resurrect $SPELL $VERSION &> /dev/null &&
+      ! does_spell_need_update $SPELL &> /dev/null &&
+      do_resurrect=yes
     fi
   fi
 
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index 40f195c..9ad4804 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -338,7 +338,7 @@ function prune_depends()
     local CANDIDATES=$( find_providers $4 )
     provider=""
       for spell in $CANDIDATES; do
-        if spell_installed $spell || spell_held $spell; then
+        if spell_ok $spell; then
           local provider=$spell
           break
         fi
@@ -701,7 +701,7 @@ function cleanse_fix_find_check()  {
     return 1;
   fi
 
-  local size=$(wc -l $I_LOG | awk '{print $1;}')
+  local size=$(wc -l < $I_LOG)
   local count=0
 
   local TMP_I_LOG=$TMP_DIR/${SPELL}/install.log
@@ -867,14 +867,14 @@ function cleanse_fix_sym_check() {
   filter_volatiles                               |
   log_adjuster /dev/stdin $TMP_I_LOG filterable root
 
-  local size=$(wc -l $TMP_I_LOG | awk '{print $1;}')
+  local size=$(wc -l < $TMP_I_LOG)
   local count=0
 
   while read LINE ; do
     progress_bar $count $size 50
     # Add this if so 'file' doesn't have to run for everything,
     # check that's a symlink first
-    if [ -h "$LINE" ] && file "$LINE" | grep "broken symbolic link" ; then
+    if [[ -h $LINE ]] && ! readlink -q -e "$LINE" > /dev/null; then
       BADLIST="${BADLIST}${LINE}"$'\n'
     fi
     let count++
@@ -883,7 +883,7 @@ function cleanse_fix_sym_check() {
   clear_line
 
   if [[ $BADLIST ]] ; then
-    message "${PROBLEM_COLOR}The following symlinks from "             \
+    message "${PROBLEM_COLOR}The following symlinks from"             \
             "${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}"                  \
             "${PROBLEM_COLOR}don't link to files it installed:"       \
             "${DEFAULT_COLOR}"
diff --git a/var/lib/sorcery/modules/libcrossinstall b/var/lib/sorcery/modules/libcrossinstall
index 2c3f179..e184e70 100755
--- a/var/lib/sorcery/modules/libcrossinstall
+++ b/var/lib/sorcery/modules/libcrossinstall
@@ -17,7 +17,7 @@
 function install_root_menu() {
 
   debug "libcrossinstall" "cross_install_menu is being built now..."
-  local C_HELP="Fill in your own preferred track root location."
+  local C_HELP="Fill in your own preferred install cache location."
   local I_HELP="Fill in your own preferred install root location."
   local S_HELP="Fill in your own preferred state root location."
   local T_HELP="Fill in your own preferred track root location."
diff --git a/var/lib/sorcery/modules/libgpg b/var/lib/sorcery/modules/libgpg
index 8c5350a..5cefac8 100755
--- a/var/lib/sorcery/modules/libgpg
+++ b/var/lib/sorcery/modules/libgpg
@@ -301,6 +301,9 @@ function gpg_user_query() {
     message "${MESSAGE_COLOR}gpg verification is disabled${DEFAULT_COLOR}"
   else
     message "${PROBLEM_COLOR}Failure to verify gpg signature${DEFAULT_COLOR}"
+    if does_spell_need_update sorcery-pubkeys; then
+      message "It looks like casting sorcery-pubkeys may help."
+    fi
     case "$3" in
       grimoire)
         if list_find "$GPG_GRIMOIRE_LIST" $2 > /dev/null 2>&1 ; then
diff --git a/var/lib/sorcery/modules/libgrimoire b/var/lib/sorcery/modules/libgrimoire
index a6594df..cd54495 100755
--- a/var/lib/sorcery/modules/libgrimoire
+++ b/var/lib/sorcery/modules/libgrimoire
@@ -169,10 +169,16 @@ function make() {
 function install_desktop_files() {
   debug "libgrimoire" "Running install_desktop_files() on $SPELL"
   local each file
-  local target_dir="/usr/share/applications"
+  local target_dir
   local desktop_dir="$SCRIPT_DIRECTORY/desktop"
   test -d $desktop_dir || return 0
 
+  if [[ $STAGED_INSTALL == off ]]; then
+    target_dir="$INSTALL_ROOT/usr/share/applications"
+  else
+    target_dir="$STAGE_DIRECTORY/TRANSL/usr/share/applications"
+  fi
+
   mkdir -p $target_dir
   for each in $(find $desktop_dir -maxdepth 1 -type f); do
     file=$(basename $each)



More information about the SM-Commit mailing list