From bee7bdc833bfb8dbe9e1cb5d804688fbe425dfb9 Mon Sep 17 00:00:00 2001
From: bescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>
Date: Sun, 2 Mar 2003 22:57:27 +0000
Subject: Fixed bug regressing when second backup was unrecoverable

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@288 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
---
 rdiff-backup/CHANGELOG               | 10 ++++++++++
 rdiff-backup/TODO                    |  9 +++++++--
 rdiff-backup/rdiff_backup/Main.py    |  2 ++
 rdiff-backup/rdiff_backup/restore.py |  4 +++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index b49447f..4c261fa 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,3 +1,13 @@
+New in v0.11.3 (2003/04/01)
+---------------------------
+
+Brought some old parts of the man page up-to-date (thanks to Olivier
+Mueller).
+
+Fixed bug if unrecoverable error on second backup to a directory (also
+repored Olivier Mueller).
+
+
 New in v0.11.2 (2003/03/01)
 ---------------------------
 
diff --git a/rdiff-backup/TODO b/rdiff-backup/TODO
index 2f0676c..0f18b34 100644
--- a/rdiff-backup/TODO
+++ b/rdiff-backup/TODO
@@ -1,10 +1,15 @@
+---------[ Short term (next version) ]-------------------------
+
+Fix --print-statistics
+
+
+---------[ Medium term ]---------------------------------------
+
 Look at Kent Borg's suggestion for restore options and digests.
 
 Add --list-files-changed-between or similar option, to list files that
 have changed between two times
 
----------[ Medium term ]---------------------------------------
-
 Add ACL support
 
 Add --dry-run option (target for v1.1.x)
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py
index c511c26..930b6c6 100644
--- a/rdiff-backup/rdiff_backup/Main.py
+++ b/rdiff-backup/rdiff_backup/Main.py
@@ -294,6 +294,8 @@ option.""" % rpout.path)
 		except os.error:
 			Log.FatalError("Unable to create directory %s" % rpout.path)
 	if not datadir.lstat(): datadir.mkdir()
+	inc_base = datadir.append_path("increments")
+	if not inc_base.lstat(): inc_base.mkdir()
 	if Log.verbosity > 0:
 		Log.open_logfile(datadir.append("backup.log"))
 	ErrorLog.open(Time.curtimestr, compress = Globals.compression)
diff --git a/rdiff-backup/rdiff_backup/restore.py b/rdiff-backup/rdiff_backup/restore.py
index 62c1af3..d9d8e58 100644
--- a/rdiff-backup/rdiff_backup/restore.py
+++ b/rdiff-backup/rdiff_backup/restore.py
@@ -296,7 +296,9 @@ class RestoreFile:
 
 	"""
 	def __init__(self, mirror_rp, inc_rp, inc_list):
-		assert mirror_rp.index == inc_rp.index, (mirror_rp, inc_rp)
+		assert mirror_rp.index == inc_rp.index, \
+			   ("mirror and inc indicies don't match: %s %s" %
+				(mirror_rp.get_indexpath(), inc_rp.get_indexpath()))
 		self.index = mirror_rp.index
 		self.mirror_rp = mirror_rp
 		self.inc_rp, self.inc_list = inc_rp, inc_list
-- 
cgit v1.2.1