Changeset 319

Timestamp:

05/02/2009 20:32:54 (3 years ago)

Author:

ccowart

Message:

• Implemented abort option on empty log.
• Cleaned up some logic surrounding determining no changes.

Fixes #24

File:

• trunk/confman.in (modified) (4 diffs)

trunk/confman.in

@@ -115 +115 @@
         conf_lock_wcopy
         local msg=$(conf_tmp_file)
-                local status=$(conf_tmp_file)
+        local orig_msg=$(conf_tmp_file)
+        local status=$(conf_tmp_file)
         local modules=$(conf_get_recipe | tr '\n' ',') 
         local ignoreline="--This line, and those below, will be ignored--"
@@ -125 +126 @@
             ${WORK_PATH}/% >> $status
                 cat $status >> $msg
+        cp $msg $orig_msg
                 if [ $(wc -l < $status) -gt 0 ] ; then
                 ${EDITOR} $msg
+            if diff $msg $orig_msg >/dev/null 2>&1 ; then
+                echo "Log message unchanged. (a)bort / (C)ontinue?"
+                read response
+                if [ "${response}" = "a" ] ; then
+                    conf_unlock_wcopy
+                    conf_unlock_system
+                    return 1
+                fi
+            fi
                 fi
-                rm -f $status
+                rm -f $status $orig_msg
         ${sed_cmd} -i '' -e '/'"$ignoreline"'/,$d' $msg 2>/dev/null
         $SUDO ${SUDO:+-v}
@@ -166 +177 @@
         conf_lock_system
         local msg=$(conf_tmp_file)
+        local orig_msg=$(conf_tmp_file)
         local status=$(conf_tmp_file)
         local modules=$(conf_get_recipe | tr '\n' ',')
@@ -181 +193 @@
         svn status $files >> $status
         cat $status >> $msg
+        cp $msg $orig_msg
         if [ $(wc -l < $status) -gt 0 ] ; then
             ${EDITOR} $msg
-        fi
-        rm $status
+            if diff $msg $orig_msg >/dev/null 2>&1 ; then
+                echo "Log message unchanged. (a)bort / (C)ontinue?"
+                read response
+                if [ "${response}" = "a" ] ; then
+                    conf_unlock_wcopy
+                    conf_unlock_system
+                    return 1
+                fi
+            fi
+        fi
+        rm $status $orig_msg
         ${sed_cmd} -i '' -e '/'"$ignoreline"'/,$d' $msg 2>/dev/null
         $SUDO ${SUDO:+-v}