Changeset 167

Timestamp:

07/05/2007 18:14:12 (5 years ago)

Author:

arjun

Message:

BugID: 5906 changed any instances of clean_exit or cleanexit to cleanExit

Location:

trunk/confman

Files:

• confman (modified) (7 diffs)
• confmancommon.sh (modified) (1 diff)
• confmanlib.sh (modified) (4 diffs)
• confsync.sh (modified) (1 diff)

trunk/confman/confman

@@ -62 +62 @@
 function update {
         if [ -z $* ] ; then
-                conf_update_tree || conf_cleanexit
+                conf_update_tree || conf_cleanExit
         else
                 print_usage 1
@@ -84 +84 @@
                 ${EDITOR} $msg
                 sudo -v
-                update || conf_cleanexit
+                update || conf_cleanExit
 
                 echo "Commit operation started" >&2
@@ -117 +117 @@
                 ${EDITOR} $msg
                 sudo -v
-                update || conf_cleanexit
+                update || conf_cleanExit
 
                 echo "Installation operation started." >&2
@@ -125 +125 @@
                 done
                 for file in $SINGULARITIES ; do
-                        conf_assemble_sing $file || conf_cleanexit
+                        conf_assemble_sing $file || conf_cleanExit
                 done
         conf_recordAction install
@@ -184 +184 @@
         if sudo [ -L $file ] ; then
                 echo "$file is a symbolic link!" >&4
-                conf_cleanexit
+                conf_cleanExit
         fi
 
@@ -492 +492 @@
         else
                 echo "Rolling $module back to $checkpoint $clock" >&2
-                conf_rollback $module $checkpoint $clock || conf_cleanexit
+                conf_rollback $module $checkpoint $clock || conf_cleanExit
                 for layer in $LAYERS ; do
                         echo "Rolling on $layer..."
-                        conf_rollout $layer || conf_cleanexit
+                        conf_rollout $layer || conf_cleanExit
                 done
 
                 for file in $SINGULARITIES ; do
-                        conf_assemble_sing $file || conf_cleanexit
+                        conf_assemble_sing $file || conf_cleanExit
                 done
                 echo "Rollback succeeded." >&2
@@ -521 +521 @@
         if [ ! -d "${WORK_PATH}/${oldmod}" ] ; then
                 echo "${MYNAME}: Error: ${WORK_PATH}/${oldmod} doesn't exist" >&4
-                conf_cleanexit
+                conf_cleanExit
         fi
         if [ -e "${WORK_PATH}/${newmod}" ] ; then
                 echo "${MYNAME}: Error: ${WORK_PATH}/${newmod}: file exists" >&4
-                conf_cleanexit
+                conf_cleanExit
         fi
         conf_rename $oldmod $newmod

trunk/confman/confmancommon.sh

@@ -86 +86 @@
 
 # And we'll set a trap:
-trap "conf_cleanexit" SIGINT SIGTERM SIGHUP
+trap "conf_cleanExit" SIGINT SIGTERM SIGHUP
 

trunk/confman/confmanlib.sh

@@ -377 +377 @@
         svn mv ${WORK_PATH}/${oldmod} ${WORK_PATH}/${newmod} || \
                 {       echo "There was a problem renaming the modules." >&4 ; \
-                        conf_clean_exit 1 
+                        conf_cleanExit 1 
                 }
         svn mv ${WORK_PATH}/${REPO_CHECKPTS}/${oldmod} \
                         ${WORK_PATH}/${REPO_CHECKPTS}/${newmod} || \
                 {       echo "There was a problem renaming the checkpts." >&4 ; \
-                        conf_clean_exit 1 
+                        conf_cleanExit 1 
                 }
 
         svn update ${WORK_PATH} || \
                 {       echo "Your working copy didn't update correctly." >&4 ; \
-                        conf_clean_exit 1 
+                        conf_cleanExit 1 
                 }
         svn commit -m "Renaming ${oldmod} to ${newmod}, phase 1." \
                 ${WORK_PATH}/{,${REPO_CHECKPTS}}/{${oldmod},${newmod}} || \
-                {       echo "Committing the changes failed." >&4 ; conf_clean_exit 1 
+                {       echo "Committing the changes failed." >&4 ; conf_cleanExit 1 
                 }
 
@@ -404 +404 @@
         svn update ${WORK_PATH} || \
                 {       echo "Your working copy didn't update correctly." >&4 ; \
-                        conf_clean_exit 1 
+                        conf_cleanExit 1 
                 }
         svn commit -m "Renaming ${oldmod} to ${newmod}, phase 2." \
                 ${WORK_PATH}/${newmod} || \
-                {       echo "Committing the changes failed." >&4 ; conf_clean_exit 1 
+                {       echo "Committing the changes failed." >&4 ; conf_cleanExit 1 
                 }
 
@@ -418 +418 @@
         svn update ${WORK_PATH} || \
                 {       echo "Your working copy didn't update correctly." >&4 ; \
-                        conf_clean_exit 1 
+                        conf_cleanExit 1 
                 }
         svn commit -m "Renaming ${oldmod} to ${newmod}, complete." \
                 ${WORK_PATH}/${newmod} || \
-                {       echo "Committing the changes failed." >&4 ; conf_clean_exit 1 
+                {       echo "Committing the changes failed." >&4 ; conf_cleanExit 1 
                 }
 }
@@ -536 +536 @@
 # The SIGNAL seems to kill the logger process spawned by the parent 
 # process, which is receiving its input from our fd 2.
-function conf_cleanexit {
+function conf_cleanExit {
     echo "Received a signal. Exiting cleanly." | conf_logger
         echo "Abort, Abort! Patience is a virtue." >&4

trunk/confman/confsync.sh

@@ -58 +58 @@
 for layer in $LAYERS ; do
         echo "Rolling on $layer..."
-        conf_rollout $layer || conf_cleanexit
+        conf_rollout $layer || conf_cleanExit
 done
 for file in $SINGULARITIES ; do
     echo "Assembing singularity $file..."
-        conf_assemble_sing $file || conf_cleanexit
+        conf_assemble_sing $file || conf_cleanExit
 done
 conf_markclean