Changeset 314 for trunk/confman.in

Timestamp:

05/02/2009 17:33:21 (3 years ago)

Author:

ccowart

Message:

Don't prompt for a commit message if no files have changed.

See #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 modules=$(conf_get_recipe | tr '\n' ',') 
         local ignoreline="--This line, and those below, will be ignored--"
@@ -123 +124 @@
         echo "$ignoreline" >> $msg
         conf_get_recipe | tr ' ' '\n' | xargs -I % svn status \
-            ${WORK_PATH}/% >> $msg
-        ${EDITOR} $msg
+            ${WORK_PATH}/% >> $status
+                cat $status >> $msg
+                if [ $(wc -l $status) -gt 0 ] ; then
+                ${EDITOR} $msg
+                fi
+                rm -f $status
         ${sed_cmd} -i '' -e '/'"$ignoreline"'/,$d' $msg 2>/dev/null
         $SUDO ${SUDO:+-v}
@@ -162 +167 @@
         conf_lock_system
         local msg=$(conf_tmp_file)
+        local status=$(conf_tmp_file)
         local modules=$(conf_get_recipe | tr '\n' ',')
         local ignoreline="---Everything after this line will be ignored---"
@@ -175 +181 @@
             files="$files $file"
         done
-        svn status $files >> $msg
-        ${EDITOR} $msg
+        svn status $files >> $status
+        cat $status >> $msg
+        if [ $(wc -l $status) ] ; then
+            ${EDITOR} $msg
+        fi
+        rm $status
         ${sed_cmd} -i '' -e '/'"$ignoreline"'/,$d' $msg 2>/dev/null
         $SUDO ${SUDO:+-v}