Source Mage code commit list

[Jaka Kranjc <scm AT sourcemage.org>]

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

 usr/bin/quill                   |   15 +++++++++++----
 var/lib/quill/ChangeLog         |   14 ++++++++++++++
 var/lib/quill/modules/libcopy   |    2 +-
 var/lib/quill/modules/libcore   |   27 +++++++++++++++++++--------
 var/lib/quill/modules/libupdate |    6 ++++++
 var/lib/quill/version           |    2 +-
 6 files changed, 52 insertions(+), 14 deletions(-)

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

        * libdesktop:use -s with fmt, so it is much less likely for the 
formatting
          to get screwed (think bulleted lists)
        * quill: copying non-quilled new spells will work now (like from bug
          attachments)
          improved an error message
        * libcopy: fixed a broken chain in ask_and_copy_over
        * libupdate: offer automatic addition of the UPSTREAM_KEY qualifier 
when we
          detect that a key should be marked as such
        * quill, libcore: extended copylefts to 2008
        * libcore: more options when mirrors are broken - they should not be 
always
          removed

diff --git a/usr/bin/quill b/usr/bin/quill
index 6269b30..8584b8e 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -1,7 +1,7 @@
 #!/bin/bash
 #---
 ## @Synopsis Spell creator script for SourceMage GNU/Linux
-## @Copyright Copyright 2006-2007 SourceMage GNU/Linux
+## @Copyright Copyright 2006-2008 SourceMage GNU/Linux
 ## @License GPL v2 or higher
 ##
 ## Asks the user in simple questions about generating a spell.
@@ -183,7 +183,10 @@ fi
 if [[ "$QUILL_UPDATE" == "on" ]]
 then
   SPELL_NAME=$QUILL_TARGET
-  codex_does_spell_exist $SPELL_NAME || exit 6
+  if ! codex_does_spell_exist $SPELL_NAME; then
+    query "Is $SPELL_NAME a new spell in QUILL_GIT_DIR?" n ||
+    exit 6
+  fi
   ask_and_copy_over || exit 7
   cd $QUILL_SPELL_DIR/$SPELL_NAME
 
@@ -280,7 +283,11 @@ then
         fi
         if [[ ! -e $GRIMOIRE/$SECTION/$SPELL_NAME ]]
         then
-          error_msg "Origin not found! Very severe!"
+          error_msg "Spell not found in the grimoire!"
+          if query "Is $SPELL_NAME a new spell in QUILL_GIT_DIR?" n
+          then
+            quill_final_put_in_grimoire
+          fi
           continue
         fi
 
@@ -290,7 +297,7 @@ then
         codex_get_spell_paths $(codex_find_spell_by_name $SPELL_NAME)
         if [[ ! -e $GRIMOIRE/$SECTION/$SPELL_NAME ]]
         then
-          error_msg "Origin not found! Very severe!"
+          error_msg "Spell not found in the grimoire!"
           continue
         fi
 
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index a400553..62a2ceb 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,17 @@
+2008-02-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * libdesktop:use -s with fmt, so it is much less likely for the 
formatting
+         to get screwed (think bulleted lists)
+       * quill: copying non-quilled new spells will work now (like from bug
+         attachments)
+         improved an error message
+       * libcopy: fixed a broken chain in ask_and_copy_over
+       * libupdate: offer automatic addition of the UPSTREAM_KEY qualifier 
when we
+         detect that a key should be marked as such
+       * quill, libcore: extended copylefts to 2008
+       * libcore: more options when mirrors are broken - they should not be 
always
+         removed (example: $url and $url/old, where old gets updated with 
delay)
+       * version: 0.2.9-rc12
+
 2008-01-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * libcore, libgpg: added --no-check-certificates to manual wget calls 
too
        * version: 0.2.9-rc11
diff --git a/var/lib/quill/modules/libcopy b/var/lib/quill/modules/libcopy
index 24eb351..7dd2d3d 100644
--- a/var/lib/quill/modules/libcopy
+++ b/var/lib/quill/modules/libcopy
@@ -139,7 +139,7 @@ function ask_and_copy_over()
     rm -fr $QUILL_SPELL_DIR/$SPELL_NAME &&
     cp -pr $SECTION_DIRECTORY/$SPELL_NAME $QUILL_SPELL_DIR &&
     message "Done." &&
-    unset GRIMOIRE SECTION GRIMOIRE_NAME SECTION_DIRECTORY
+    unset GRIMOIRE SECTION GRIMOIRE_NAME SECTION_DIRECTORY &&
     SPELL_UPDATED=n
   elif [[ $reply == "QUILL_GIT_DIR" ]]
   then
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 46aafd8..370e4c0 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -320,11 +320,22 @@ function check_source_urls() {
           rc=0
         else
           # if they are still not ok ask for fixed ones
-          error_msg  "SOURCE${i}_URL[$mirror_num] is hopelessly broken! Fix 
it manually."
-          sleep 2
-          quill_edit DETAILS
-          add_history_entry "DETAILS: Fixed SOURCE${i}_URL[$mirror_num]"
-          rc=1
+          if [[ $mirror_num == 0 ]]; then
+            error_msg  "SOURCE${i}_URL[0] is hopelessly broken! Fix it 
manually."
+            sleep 2
+            quill_edit DETAILS
+            add_history_entry "DETAILS: Fixed SOURCE${i}_URL[0]"
+            rc=1
+          else # be less strict for mirrors
+            error_msg  "SOURCE${i}_URL[$mirror_num] is broken. Perhaps it 
should be removed."
+            if query "Do you want to fix or remove it?" n; then
+              quill_edit DETAILS
+              add_history_entry "DETAILS: Fixed SOURCE${i}_URL[$mirror_num]"
+              rc=1
+            else
+              rc=0
+            fi
+          fi
         fi
       fi
       let mirror_num++
@@ -355,7 +366,7 @@ function dump_default_function() {
 function quill_version() {
 
   message "quill - $QUILL_VERSION
-Copyright (C) 2006-2007 Source Mage
+Copyright (C) 2006-2008 Source Mage
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
@@ -473,7 +484,7 @@ function check_description_wrap(){
       long.description && rm long.description && return 0
 
   sed -i '/cat *<< *EOF/,/EOF/d' DETAILS
-  sed '1d; $d' long.description | fmt -w 80 > long.description.2
+  sed '1d; $d' long.description | fmt -s -w 80 > long.description.2
   mv long.description.2 long.description
   echo 'cat << EOF' >> DETAILS
   cat long.description >> DETAILS
@@ -576,7 +587,7 @@ function query_msg() {
 function quill_help() {
 
   message "quill $QUILL_VERSION
-Copyright (C) 2006-2007 Source Mage
+Copyright (C) 2006-2008 Source Mage
 This is free software.  You may redistribute copies of it under the terms of
 the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
 There is NO WARRANTY, to the extent permitted by law.
diff --git a/var/lib/quill/modules/libupdate b/var/lib/quill/modules/libupdate
index 9409384..f644da5 100644
--- a/var/lib/quill/modules/libupdate
+++ b/var/lib/quill/modules/libupdate
@@ -231,6 +231,12 @@ function version_bump() {
           error_msg "This looks like an upstream keyring and should be 
marked as such."
           error_msg "Probably with :UPSTREAM_KEY at the end of the 
$current_check."
           error_msg "Do not replace it!"
+          if query "Do you want to add this qualifier?" y; then
+            sed -i 
"s/SOURCE${i}_GPG=['\"]*${current_check}.*['\"]*\s*$/SOURCE${i}_GPG=$current_check:UPSTREAM_KEY/"
 DETAILS
+            remove_old_sigs "$version" # likely not needed, but be thorough
+            inc_src_num i
+            continue
+          fi
         fi
         if ! query "Do you want to replace SOURCE${i}_GPG with a hash?" n; 
then
           # sign it and continue
diff --git a/var/lib/quill/version b/var/lib/quill/version
index b026830..5a1283a 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.9-rc11
+0.2.9-rc12