[SM-Commit] GIT changes to master cauldron by Justin Boffemmyer (92ad4b4c2de2b8d8636eb401c15c2420e65f7373)

Justin Boffemmyer scm at sourcemage.org
Thu Jun 23 20:45:50 EDT 2011


GIT changes to master cauldron by Justin Boffemmyer <flux at sourcemage.org>:

 cauldron/lib/libcauldron          |    4 +-
 enchantment/lib/libenchantment    |    4 +-
 enchantment/shell/bin/enchantment |   54 +++++++++++++++++++-------------------
 ward/libward                      |    4 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 92ad4b4c2de2b8d8636eb401c15c2420e65f7373
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    liberror_check_fatal_error -> liberror_check_fatal
    
    Update all the sources to use the new function name.

diff --git a/cauldron/lib/libcauldron b/cauldron/lib/libcauldron
index d55813b..4257638 100755
--- a/cauldron/lib/libcauldron
+++ b/cauldron/lib/libcauldron
@@ -53,7 +53,7 @@ unset cauldron_fatal_error
 #-------------------------------------------------------------------------------
 ## @param library name to load (no path, just basename)
 ##
-## Loads the library given as the first argument. liberror_check_fatal_error is
+## Loads the library given as the first argument. liberror_check_fatal is
 ## called to check if there was a problem loading the library, and if there was
 ## it will print a corresponding error message and then exit with the error
 ## $ERR_LOAD_LIBRARY.
@@ -63,7 +63,7 @@ function cauldron_load_library() {
   local lib="$1"
 
   . "$CAULDRON_LIBS/$lib" 2>$CAULDRON_NULL
-  liberror_check_fatal_error
+  liberror_check_fatal
 }
 
 #-------------------------------------------------------------------------------
diff --git a/enchantment/lib/libenchantment b/enchantment/lib/libenchantment
index 73ad4fd..48bcb8e 100755
--- a/enchantment/lib/libenchantment
+++ b/enchantment/lib/libenchantment
@@ -60,7 +60,7 @@ unset enchant_fatal_error
 #-------------------------------------------------------------------------------
 ## @param library name to load (no path, just basename)
 ##
-## Loads the library given as the first argument. liberror_check_fatal_error is
+## Loads the library given as the first argument. liberror_check_fatal is
 ## called to check if there was a problem loading the library, and if there was
 ## it will print a corresponding error message and then exit with the error
 ## $ERR_LOAD_LIBRARY.
@@ -70,7 +70,7 @@ function enchant_load_library() {
   local lib="$1"
 
   . "$ENCHANT_LIBS/$lib" 2>$ENCHANT_NULL
-  liberror_check_fatal_error
+  liberror_check_fatal
 }
 
 #-------------------------------------------------------------------------------
diff --git a/enchantment/shell/bin/enchantment b/enchantment/shell/bin/enchantment
index ed9c528..2cd9b17 100755
--- a/enchantment/shell/bin/enchantment
+++ b/enchantment/shell/bin/enchantment
@@ -65,7 +65,7 @@ function enchant_shell_command_chroot() {
   # so don't check the number of arguments
 
   enchant_shell_perform_chroot "$@"
-  liberror_check_fatal_error
+  liberror_check_fatal
 
   return $ERR_OK
 }
@@ -74,7 +74,7 @@ function_enchant_shell_command_list() {
   [[ $# -eq 0 ]] || return $ERR_INSTALLER_CMD
 
   enchant_shell_list_modules
-  liberror_check_fatal_error
+  liberror_check_fatal
 
   return $ERR_OK
 }
@@ -83,7 +83,7 @@ function enchant_shell_command_todo() {
   [[ $# -le 1 ]] || return $ERR_INSTALLER_CMD
 
   enchant_shell_perform_todo "$@"
-  liberror_check_fatal_error
+  liberror_check_fatal
 
   return $ERR_OK
 }
@@ -92,7 +92,7 @@ function enchant_shell_command_jump() {
   [[ $# -eq 1 ]] || return $ERR_INSTALLER_CMD
 
   enchant_shell_perform_jump "$@"
-  liberror_check_fatal_error
+  liberror_check_fatal
 
   return $ERR_OK
 }
@@ -101,7 +101,7 @@ function enchant_shell_command_help() {
   [[ $# -le 1 ]] || return $ERR_INSTALLER_CMD
 
   enchant_shell_perform_help "$@"
-  liberror_check_fatal_error
+  liberror_check_fatal
 
   return $ERR_OK
 }
@@ -111,7 +111,7 @@ function enchant_shell_command_init() {
   [[ "$#" -eq 0 ]] || return $ERR_INSTALLER_CMD
 
   enchant_prepare
-  liberror_check_fatal_error
+  liberror_check_fatal
 
   return $ERR_OK
 }
@@ -124,36 +124,36 @@ function enchant_shell_command_install {
     "kernel" )
       [[ $# -ne 3 ]] && return $ERR_INSTALLER_CMD
       enchant_install_kernel "$@"
-      liberror_check_fatal_error
+      liberror_check_fatal
       ;;
     "isokernel" )
       [[ $# -ne 0 ]] && return $ERR_INSTALLER_CMD
       enchant_install_kernel
-      liberror_check_fatal_error
+      liberror_check_fatal
       ;;
     "system" )
       [[ $# -ne 0 ]] && return $ERR_INSTALLER_CMD
       enchant_install_system
-      liberror_check_fatal_error
+      liberror_check_fatal
       ;;
     "spells" )
       [[ $# -ne 0 ]] && return $ERR_INSTALLER_CMD
       enchant_install_spell_sources
-      liberror_check_fatal_error
+      liberror_check_fatal
       enchant_install_spell_caches
-      liberror_check_fatal_error
+      liberror_check_fatal
       ;;
     "sources" )
       # can take either 0 or multiple arguments,
       # so don't check the number of arguments
       enchant_install_sources "$@"
-      liberror_check_fatal_error
+      liberror_check_fatal
       ;;
     "caches" )
       # can take either 0 or multiple arguments,
       # so don't check the number of arguments
       enchant_install_caches "$@"
-      liberror_check_fatal_error
+      liberror_check_fatal
       ;;
     * ) return $ERR_INSTALLER_CMD ;;
   esac
@@ -179,59 +179,59 @@ shift
 case "$command" in
   "keymap" )
     enchant_shell_command_keymap
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "init" )
     enchant_shell_command_init
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "prompt" )
     enchant_shell_command_prompt
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "chroot" )
     enchant_shell_command_chroot "$@"
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "todo" )
     enchant_shell_command_todo "$@"
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "list" )
     enchant_shell_command_list_modules "$@"
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "next" )
     enchant_shell_perform_next
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "prev" )
     enchant_shell_perform_prev
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "jump" )
     enchant_shell_command_jump "$@"
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "welcome" )
     enchant_shell_perform_welcome
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "install" )
     enchant_shell_command_install "$@"
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "potion" )
     enchant_shell_command_potion "$@"
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   "help" )
     enchant_shell_command_help "$@"
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
   * )
     enchant_shell_command_help
-    liberror_check_fatal_error
+    liberror_check_fatal
     ;;
 esac
 
diff --git a/ward/libward b/ward/libward
index 4612b88..0d6036a 100644
--- a/ward/libward
+++ b/ward/libward
@@ -54,7 +54,7 @@ unset ward_fatal_error
 #-------------------------------------------------------------------------------
 ## @param library name to load (no path, just basename)
 ##
-## Loads the library given as the first argument. liberror_check_fatal_error is
+## Loads the library given as the first argument. liberror_check_fatal is
 ## called to check if there was a problem loading the library, and if there was
 ## it will print a corresponding error message and then exit with the error
 ## $ERR_LOAD_LIBRARY.
@@ -64,7 +64,7 @@ function ward_load_library() {
   local lib="$1"
 
   . "$WARD_PATH/$lib" 2>$WARD_NULL
-  liberror_check_fatal_error
+  liberror_check_fatal
 }
 
 #-------------------------------------------------------------------------------


More information about the SM-Commit mailing list