[SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (2890718304a59343385c227bd1d26fb3e06656c1)

David Brown scm at mail.sourcemage.org
Tue Oct 31 16:31:13 EST 2006


GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 at gmail.com>:

 ChangeLog                          |    7 +++++++
 etc/sorcery/config                 |    2 +-
 etc/sorcery/version                |    2 +-
 var/lib/sorcery/modules/libdepends |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit d95cba4e098fd128a5ab99cd43c2a96069371d44
Author: Andrew Stitt <astitt at sourcemage.org>
Commit: Andrew Stitt <astitt at sourcemage.org>

    remove sorcery path for archspecs

commit d4d16d4e50fa221066274da90ee290c91e576b5a
Author: Andrew Stitt <astitt at sourcemage.org>
Commit: Andrew Stitt <astitt at sourcemage.org>

    fix trigger checking again

diff --git a/ChangeLog b/ChangeLog
index fc7105e..6222df5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-31 Andrew Stitt <astitt at sourcemage.org>
+	* etc/sorcery/config: remove sorcery path for archspecs
+
+2006-09-29 Andrew Stitt <astitt at sourcemage.org>
+	* libdepends: properly rename default_sorcery_trigger_check
+	  to real_default_sorcery_trigger_check
+
 2006-09-25 Andrew Stitt <astitt at sourcemage.org>
 	* gaze: add standard spell paths to gaze dependencies environment
 	  bug 12966
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 08de72f..44dd621 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -117,7 +117,7 @@ GRIMOIRE_MANIFEST_ALGORITHM=sha1
   SGL_LIBRARY_MODULES=${SGL_LIBRARY}/modules
            # system archspecs are still considered part of sorcery
            # and are deliberatly not in INSTALL_ROOT
-           ARCH_SPECS="/usr/share/archspecs ${SGL_LIBRARY}/archspecs"
+           ARCH_SPECS="/usr/share/archspecs"
              EXCLUDED=${SGL_LIBRARY}/excluded
                 CODEX=${SGL_LIBRARY}/codex
             PROTECTED=${SGL_LIBRARY}/protected
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 1a32d89..32e03ca 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-20060626
+20060925
diff --git a/var/lib/sorcery/modules/libdepends b/var/lib/sorcery/modules/libdepends
index 2dd5372..470a8e0 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1400,7 +1400,7 @@ #---------------------------------------
 ## Default trigger checking function. Asks user if they want to
 ## run the trigger.
 #---------------------------------------------------------------------
-function default_sorcery_trigger_check() {
+function real_default_sorcery_trigger_check() {
   message  "${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}" \
            "${CHECK_COLOR}triggers a" \
            "${SPELL_COLOR}${ACTION}${DEFAULT_COLOR}" \



More information about the SM-Commit mailing list