Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.13 sorcery by Jaka Kranjc (152bdd505d67d18a18ddc0416b2c902bb519e784)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test-1.13 sorcery by Jaka Kranjc (152bdd505d67d18a18ddc0416b2c902bb519e784)
  • Date: Fri, 23 Nov 2007 11:36:35 -0600

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

ChangeLog | 11 +++++++++++
etc/sorcery/mirrors/SOURCEFORGE | 13 ++++++++++---
etc/sorcery/version | 2 +-
usr/sbin/gaze | 4 ++--
usr/sbin/scribe | 2 +-
usr/sbin/sorcery | 33 +++++++++++++++------------------
var/lib/sorcery/excluded | 1 -
7 files changed, 40 insertions(+), 26 deletions(-)

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

1.13.7-rc4

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

gaze: fixed matching of spell and short during gaze search #9433
(cherry picked from commit e2babc7cbff219e4125a639df0bc10dcf58da823)

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

scribe: fixed error message when swapping nonexsistant grimoires #13253
(cherry picked from commit ab8b0b2b7da80679ac7b680e3c28e0b7e19cfd9f)

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

mirrors/SOURCEFORGE: updated list from #13504
(cherry picked from commit 6ef27a5a97736ef6f0082995f7ddabd9d630df47)

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

sorcery: rewrote show_installed_spell and fixed remove_pkgs - removing
spells from the sorcery menu works again

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

excluded: removed /var/yp - the one spell that uses it, installs config
files there #11831
(cherry picked from commit fdbebdeb09cab13b1b7176fc29649df55ce056f8)

diff --git a/ChangeLog b/ChangeLog
index f3b2cbf..3981f4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * sorcery: rewrote show_installed_spell and fixed remove_pkgs -
removing
+ spells from the sorcery menu works again
+ * mirrors/SOURCEFORGE: updated list from #13504
+ * scribe: fixed error message when swapping nonexsistant grimoires
#13253
+ * gaze: fixed matching of spell and short during gaze search #9433
+
+2007-11-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * excluded: removed /var/yp - the one spell that uses it, installs
config
+ files there #11831
+
2007-10-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdepends: fixed some more quoting regressions since stable. Should
eliminate some bad provider query defaults
diff --git a/etc/sorcery/mirrors/SOURCEFORGE b/etc/sorcery/mirrors/SOURCEFORGE
index df70f06..b09d662 100755
--- a/etc/sorcery/mirrors/SOURCEFORGE
+++ b/etc/sorcery/mirrors/SOURCEFORGE
@@ -2,10 +2,17 @@
"Bern (CH) mirror" http://puzzle.dl.sourceforge.net/sourceforge
"Dublin (IE) mirror" http://heanet.dl.sourceforge.net/sourceforge
"Dusseldorf (DE) mirror" http://mesh.dl.sourceforge.net/sourceforge
-"Georgia (US) mirror" http://internap.dl.sourceforge.net/sourceforge
+"California (US) mirror" http://internap.dl.sourceforge.net/sourceforge
"Ishikawa (JP) mirror" http://jaist.dl.sourceforge.net/sourceforge
"Minnesota (US) mirror" http://umn.dl.sourceforge.net/sourceforge
-"New York (US) mirror" http://voxel.dl.sourceforge.net/sourceforge
+"Virginia (US) mirror"
http://superb-east.dl.sourceforge.net/sourceforge
+"Washington (US) mirror"
http://superb-west.dl.sourceforge.net/sourceforge
"Paris (FR) mirror" http://ovh.dl.sourceforge.net/sourceforge
-"Reston (US) mirror" http://aleron.dl.sourceforge.net/sourceforge
+"Arizona (US) mirror" http://easynews.dl.sourceforge.net/sourceforge
"Sydney (AU) mirror" http://optusnet.dl.sourceforge.net/sourceforge
+"Tainan (TW) mirror" http://nchc.dl.sourceforge.net/sourceforge
+"Brussels (BE) mirror" http://belnet.dl.sourceforge.net/sourceforge
+"Lausanne (CH) mirror" http://switch.dl.sourceforge.net/sourceforge
+"Amsterdam (NL) mirror" http://surfnet.dl.sourceforge.net/sourceforge
+"Kent (UK) mirror" http://kent.dl.sourceforge.net/sourceforge
+"Curitiba (BR) mirror" http://ufpr.dl.sourceforge.net/sourceforge
diff --git a/etc/sorcery/version b/etc/sorcery/version
index e2747ff..0e93422 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.13.7-rc3
+1.13.7-rc4
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index e74426b..57acb21 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -738,8 +738,8 @@ function real_long_search() {
pattern=${SEARCH[$i]}
SEARCH_RESULTS=$(gawk 'BEGIN{ORS = ""; IGNORECASE=1; inLongDesc=0}
/'"${pattern}"'/{
- if(/^[[:blank:]]*SPELL/) {print "(Name Match)"; exit 0;}
- if(/^[[:blank:]]*SHORT/) {print "(Short Description)"; exit 0;}
+ if(/^[[:blank:]]*SPELL=.*'"${pattern}"'/) {print "(Name Match)";
exit 0;}
+ if(/^[[:blank:]]*SHORT=.*'"${pattern}"'/) {print "(Short
Description)"; exit 0;}
if(inLongDesc) {print "(Description)"; exit 0;}
}
/cat[[:blank:]]*<<[[:blank:]]*EOF/{inLongDesc = 1;}
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index a4c4d46..e22ed82 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -540,7 +540,7 @@ function scribe_swap() {
return 1
fi
if ! codex_find_grimoire $grim2 grimoire2 idx2 ; then
- message "Grimoire $grim1 not found"
+ message "Grimoire $grim2 not found"
return 1
fi
message -n "swapping "
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 5121e9c..e02bba9 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -308,25 +308,22 @@ file_menu() {


show_installed_spells() {
+ local spell date status version

- for LINE in `sort $SPELL_STATUS`; do
+ while read spell date status version; do
+ if [[ $status == "installed" ]] ||
+ [[ $status == "held" ]]; then

- SPELL=`echo "$LINE" | cut -d : -f1`
- STATUS=`echo "$LINE" | cut -d : -f3`
- VERSION=`echo "$LINE" | cut -d : -f4`
-
- if [ "$STATUS" == "installed" ] ||
- [ "$STATUS" == "held" ]; then
-
- if codex_set_current_spell_by_name $SPELL; then
- echo -en '"'${SPELL:="Unknown"}'"'
- echo -en '\t"'${VERSION:="-"}'"'
- echo -e '\t"'${SHORT:="Description Unavailable"}'"'
+ if codex_set_current_spell_by_name $spell; then
+ SHORT=${SHORT:-"Description unavailable"}
+ echo -en '"'${spell:="Unknown"}'"'
+ echo -en '\t"'${version:="-"}'"'
+ echo -e '\t"'${SHORT//\"/\'}'"'
fi

fi
- done
-
+ done < <(tr : " " < $SPELL_STATUS) | sort
+ codex_clear_current_spell
}


@@ -353,13 +350,13 @@ remove_pkgs() {
codex_set_current_spell_by_name $SPELL
DESCRIPTION=`codex_get_spell_description $SPELL_DIRECTORY`

- if $DIALOG --title "Remove $SPELL?" \
+ if eval $DIALOG '--title "Remove $SPELL?" \
--yesno "$DESCRIPTION" \
- 0 0
+ 0 0'
then
push_remove_queue $SPELL &&
- $DIALOG --msgbox "$SPELL added to the remove queue." 0 0 ||
- $DIALOG --msgbox "$SPELL is not really installed?" 0 0
+ eval $DIALOG '--msgbox "$SPELL added to the remove queue." 0 0' ||
+ eval $DIALOG '--msgbox "$SPELL is not really installed?" 0 0'
fi

done
diff --git a/var/lib/sorcery/excluded b/var/lib/sorcery/excluded
index 27eab72..98e5b79 100755
--- a/var/lib/sorcery/excluded
+++ b/var/lib/sorcery/excluded
@@ -43,5 +43,4 @@
^/var/state
^/var/tmp
^/var/www
-^/var/yp
^/usr/lib/perl.*/.*/.*-linux-thread-multi/perllocal\.pod



  • [SM-Commit] GIT changes to test-1.13 sorcery by Jaka Kranjc (152bdd505d67d18a18ddc0416b2c902bb519e784), Jaka Kranjc, 11/23/2007

Archive powered by MHonArc 2.6.24.

Top of Page