Fix error message when root is not a directory

Thanks to Edward Allcutt for the report.

3 files changed, 25 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 08a5d775..dda80461 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@ Version 0.29, released UNRELEASED; a BETA release
 * "obnam fsck" is now a bit faster.
 * The shared directories in the repository are now locked only during updates,
   allowing more efficient concurrent backups between several computers.
+* Obnam now gives a better error message when a backup root is not a 
+  directory. Thanks to Edward Allcutt for reporting the error
+  (<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=654211>).
 
 Version 0.28, released 2012-05-10; a BETA release
 -------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index f1a1f2eb..2c2fe155 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+obnam (0.29-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fix "backup of individual file fails with ENOENT" (Closes: #654211)
+
+ -- Lars Wirzenius <liw@liw.fi>  Thu, 24 May 2012 17:05:25 +0200
+
 obnam (0.28-1) unstable; urgency=low
 
   * New upstream version. Closes the following bugs reported to Debian:
diff --git a/obnamlib/plugins/backup_plugin.py b/obnamlib/plugins/backup_plugin.py
index ad321dc3..830edb96 100644
--- a/obnamlib/plugins/backup_plugin.py
+++ b/obnamlib/plugins/backup_plugin.py
@@ -226,17 +226,27 @@ class BackupPlugin(obnamlib.ObnamPlugin):
 
             logging.info('Backup finished.')
             self.app.dump_memory_profile('at end of backup run')
-        except BaseException:
+        except BaseException, e:
+            logging.debug('Handling exception %s' % str(e))
+            logging.debug(traceback.format_exc())
+            self.unlock_when_error()
+            raise
+
+        if self.errors:
+            raise obnamlib.Error('There were errors during the backup')
+
+    def unlock_when_error(self):
+        try:
             if self.repo.got_client_lock:
                 logging.info('Unlocking client because of error')
                 self.repo.unlock_client()
             if self.repo.got_shared_lock:
                 logging.info('Unlocking shared trees because of error')
                 self.repo.unlock_shared()
-            raise
-
-        if self.errors:
-            raise obnamlib.Error('There were errors during the backup')
+        except BaseException, e2:
+            logging.debug('Got second exception while unlocking: %s' % 
+                            str(e2))
+            logging.debug(traceback.format_exc())
 
     def add_chunks_to_shared(self):
         if self.chunkid_pool: