[2686] Catch a few more exceptions

[Robert Millan]

Revision: 2686
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2686
Author:   robertmh
Date:     2009-11-07 13:52:40 +0000 (Sat, 07 Nov 2009)
Log Message:
-----------
Catch a few more exceptions

Modified Paths:
--------------
    people/robertmh/svn2bzr/process_commit

Modified: people/robertmh/svn2bzr/process_commit
===================================================================
--- people/robertmh/svn2bzr/process_commit      2009-11-07 12:56:42 UTC (rev 
2685)
+++ people/robertmh/svn2bzr/process_commit      2009-11-07 13:52:40 UTC (rev 
2686)
@@ -41,10 +41,17 @@
 echo "r${revision} | ${username} | `date -d @${date}` | `echo ${message} | cut 
-c -30`"
 
 if svn diff -r ${previous}:${revision} ${url} > ${tmp} ; then
+  if ! log="`LANG=C diffstat ${tmp}`" ; then
+    trap - EXIT
+    die "${tmp} doesn't look like a patch"
+  fi
+  if [ "${log}" = " 0 files changed" ] ; then
+    echo "${tmp} looks like an empty patch, skipping r${revision}" >&2
+    exit 0
+  fi
   if ! patch -p0 < ${tmp} > /dev/null ; then
-    echo "Patch failed to apply: ${tmp}" >&2
     trap - EXIT
-    exit 1
+    die "Patch failed to apply: ${tmp}"
   fi
 else
   cat << EOF >&2