Changeset 106

Timestamp:

05/21/2006 14:55:27 (6 years ago)

Author:

ccowart

Message:

Some error checking for renaming. This hasn't been tested

File:

• confman/confmanlib.sh (modified) (3 diffs)

confman/confmanlib.sh

@@ -320 +320 @@
 
         # First, we perform the easy operations
-        svn mv ${WORK_PATH}/${oldmod} ${WORK_PATH}/${newmod}
+        svn mv ${WORK_PATH}/${oldmod} ${WORK_PATH}/${newmod} || \
+                {       echo "There was a problem renaming the modules." > &4 ; \
+                        conf_clean_exit 1 }
         svn mv ${WORK_PATH}/${REPO_CHECKPTS}/${oldmod} \
-                        ${WORK_PATH}/${REPO_CHECKPTS}/${newmod}
-
+                        ${WORK_PATH}/${REPO_CHECKPTS}/${newmod} || \
+                {       echo "There was a problem renaming the checkpts." >&4 ; \
+                        conf_clean_exit 1 }
+
+        svn update ${WORK_PATH} || \
+                {       echo "Your working copy didn't update correctly." >&4 ; \
+                        conf_clean_exit 1 }
         svn commit -m "Renaming ${oldmod} to ${newmod}, phase 1." \
-                ${WORK_PATH}/{,${REPO_CHECKPTS}}/{${oldmod},${newmod}}
+                ${WORK_PATH}/{,${REPO_CHECKPTS}}/{${oldmod},${newmod}} || \
+                {       echo "Committing the changes failed." >&4 ; conf_clean_exit 1 }
 
         # Next, we have to rename any singularities
@@ -335 +343 @@
         done
 
+        svn update ${WORK_PATH} || \
+                {       echo "Your working copy didn't update correctly." >&4 ; \
+                        conf_clean_exit 1 }
         svn commit -m "Renaming ${oldmod} to ${newmod}, phase 2." \
-                ${WORK_PATH}/${newmod}
+                ${WORK_PATH}/${newmod} || \
+                {       echo "Committing the changes failed." >&4 ; conf_clean_exit 1 }
 
         # Now, we have to go fix all the confman headers in all the files...
@@ -343 +355 @@
                 {} \;
         
+        svn update ${WORK_PATH} || \
+                {       echo "Your working copy didn't update correctly." >&4 ; \
+                        conf_clean_exit 1 }
         svn commit -m "Renaming ${oldmod} to ${newmod}, complete." \
-                ${WORK_PATH}/${newmod}
+                ${WORK_PATH}/${newmod} || \
+                {       echo "Committing the changes failed." >&4 ; conf_clean_exit 1 }
 }