See changelog for 0.6.1

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r0-6@54 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

7 files changed, 17 insertions, 11 deletions

diff --git a/rdiff-backup/rdiff_backup/highlevel.py b/rdiff-backup/rdiff_backup/highlevel.py
index 55fe007..1e1b3de 100644
--- a/rdiff-backup/rdiff_backup/highlevel.py
+++ b/rdiff-backup/rdiff_backup/highlevel.py
@@ -270,8 +270,10 @@ class HLDestinationStruct:
 				 (exp[0] in [2,  # Means that a file is missing
 							 5,  # Reported by docv (see list)
 							 13, # Permission denied IOError
-							 26] # Requested by Campbell (see list) -
+							 20, # Means a directory changed to non-dir
+							 26, # Requested by Campbell (see list) -
                                  # happens on some NT systems
+							 36] # filename too long
 				 ))):
 				Log("Skipping file", 2)
 				return None
diff --git a/rdiff-backup/rdiff_backup/log.py b/rdiff-backup/rdiff_backup/log.py
index 5416fd2..487c04c 100644
--- a/rdiff-backup/rdiff_backup/log.py
+++ b/rdiff-backup/rdiff_backup/log.py
@@ -135,8 +135,8 @@ class Logger:
 
 		exc_info = sys.exc_info()
 		logging_func("Exception %s raised of class %s" %
-					 (exc_info[1], exc_info[0]), 2)
-		logging_func("".join(traceback.format_tb(exc_info[2])), 2)
+					 (exc_info[1], exc_info[0]), 3)
+		logging_func("".join(traceback.format_tb(exc_info[2])), 3)
 		
 
 Log = Logger()
diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py
index c23ff6a..5a7f82e 100644
--- a/rdiff-backup/rdiff_backup/robust.py
+++ b/rdiff-backup/rdiff_backup/robust.py
@@ -295,8 +295,8 @@ class SaveState:
 
 	def touch_last_file(cls):
 		"""Touch last file marker, indicating backup has begun"""
-		cls._last_file_sym.touch()
-
+		if not cls._last_file_sym.lstat(): cls._last_file_sym.touch()
+		
 	def touch_last_file_definitive(cls):
 		"""Create last-file-definitive marker
 
@@ -403,6 +403,7 @@ class Resume:
 
 	def SetSessionInfo(cls):
 		"""Read data directory and initialize _session_info"""
+		assert Globals.isbackup_writer
 		silist = []
 		rp_quad_dict = cls.group_rps_by_time(cls.get_relevant_rps())
 		times = rp_quad_dict.keys()
diff --git a/rdiff-backup/src/highlevel.py b/rdiff-backup/src/highlevel.py
index 55fe007..1e1b3de 100644
--- a/rdiff-backup/src/highlevel.py
+++ b/rdiff-backup/src/highlevel.py
@@ -270,8 +270,10 @@ class HLDestinationStruct:
 				 (exp[0] in [2,  # Means that a file is missing
 							 5,  # Reported by docv (see list)
 							 13, # Permission denied IOError
-							 26] # Requested by Campbell (see list) -
+							 20, # Means a directory changed to non-dir
+							 26, # Requested by Campbell (see list) -
                                  # happens on some NT systems
+							 36] # filename too long
 				 ))):
 				Log("Skipping file", 2)
 				return None
diff --git a/rdiff-backup/src/log.py b/rdiff-backup/src/log.py
index 5416fd2..487c04c 100644
--- a/rdiff-backup/src/log.py
+++ b/rdiff-backup/src/log.py
@@ -135,8 +135,8 @@ class Logger:
 
 		exc_info = sys.exc_info()
 		logging_func("Exception %s raised of class %s" %
-					 (exc_info[1], exc_info[0]), 2)
-		logging_func("".join(traceback.format_tb(exc_info[2])), 2)
+					 (exc_info[1], exc_info[0]), 3)
+		logging_func("".join(traceback.format_tb(exc_info[2])), 3)
 		
 
 Log = Logger()
diff --git a/rdiff-backup/src/main.py b/rdiff-backup/src/main.py
index c207082..0764d7c 100755
--- a/rdiff-backup/src/main.py
+++ b/rdiff-backup/src/main.py
@@ -168,7 +168,7 @@ rdiff-backup with the --force option if you want to mirror anyway.""" %
 		SetConnections.BackupInitConnections(rpin.conn, rpout.conn)
 		self.backup_init_dirs(rpin, rpout)
 		Time.setcurtime()
-		RSI = Resume.ResumeCheck()
+		RSI = Globals.backup_writer.Resume.ResumeCheck()
 		if self.prevtime:
 			Time.setprevtime(self.prevtime)
 			SaveState.init_filenames(1)
diff --git a/rdiff-backup/src/robust.py b/rdiff-backup/src/robust.py
index c23ff6a..5a7f82e 100644
--- a/rdiff-backup/src/robust.py
+++ b/rdiff-backup/src/robust.py
@@ -295,8 +295,8 @@ class SaveState:
 
 	def touch_last_file(cls):
 		"""Touch last file marker, indicating backup has begun"""
-		cls._last_file_sym.touch()
-
+		if not cls._last_file_sym.lstat(): cls._last_file_sym.touch()
+		
 	def touch_last_file_definitive(cls):
 		"""Create last-file-definitive marker
 
@@ -403,6 +403,7 @@ class Resume:
 
 	def SetSessionInfo(cls):
 		"""Read data directory and initialize _session_info"""
+		assert Globals.isbackup_writer
 		silist = []
 		rp_quad_dict = cls.group_rps_by_time(cls.get_relevant_rps())
 		times = rp_quad_dict.keys()