Merge pull request #1 from fmarier/issue60

Return an error when aborting due to existing .orig file

Author: fmarier

patch.py

@@ -940,6 +940,7 @@ def apply(self, strip=0, root=None):
         backupname = filename+b".orig"
         if exists(backupname):
           warning("can't backup original file to %s - aborting" % backupname)
+          errors += 1
         else:
           import shutil
           shutil.move(filename, backupname)