--windows-mode now implies --no-hard-links. DSRPath.path now

correctly initialized from another RPath.


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@221 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

6 files changed, 8 insertions, 2 deletions

diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py
index 963f4ce..91357ac 100644
--- a/rdiff-backup/rdiff_backup/Main.py
+++ b/rdiff-backup/rdiff_backup/Main.py
@@ -150,6 +150,7 @@ def parse_cmdlineoptions(arglist):
 			Globals.set('time_separator', "_")
 			Globals.set('chars_to_quote', "A-Z:")
 			Globals.set('quoting_enabled', 1)
+			Globals.set('preserve_hardlinks', 0)
 			select_opts.append(("--exclude-special-files", None))
 		elif opt == '--windows-time-format':
 			Globals.set('time_separator', "_")
diff --git a/rdiff-backup/rdiff_backup/destructive_stepping.py b/rdiff-backup/rdiff_backup/destructive_stepping.py
index 60fc4e9..1688f7c 100644
--- a/rdiff-backup/rdiff_backup/destructive_stepping.py
+++ b/rdiff-backup/rdiff_backup/destructive_stepping.py
@@ -54,6 +54,7 @@ class DSRPath(RPath):
 			assert isinstance(conn_or_rp, RPath)
 			RPath.__init__(self, conn_or_rp.conn,
 						   conn_or_rp.base, conn_or_rp.index)
+			self.path = conn_or_rp.path # conn_or_rp may be quoted
 		else: RPath.__init__(self, conn_or_rp, base, index)
 
 		if source != "bypass":
diff --git a/rdiff-backup/rdiff_backup/selection.py b/rdiff-backup/rdiff_backup/selection.py
index 6305b02..6c59ccc 100644
--- a/rdiff-backup/rdiff_backup/selection.py
+++ b/rdiff-backup/rdiff_backup/selection.py
@@ -197,7 +197,8 @@ class Select:
 
 		if self.quoting_on:
 			for subdir in FilenameMapping.get_quoted_dir_children(dsrpath):
-				for dsrp in rec_func(subdir, rec_func, sel_func): yield dsrp
+				for dsrp in rec_func(subdir, rec_func, sel_func):
+					yield dsrp
 		else:
 			for filename in Robust.listrp(dsrpath):
 				new_dsrp = Robust.check_common_error(
diff --git a/rdiff-backup/src/Main.py b/rdiff-backup/src/Main.py
index 963f4ce..91357ac 100644
--- a/rdiff-backup/src/Main.py
+++ b/rdiff-backup/src/Main.py
@@ -150,6 +150,7 @@ def parse_cmdlineoptions(arglist):
 			Globals.set('time_separator', "_")
 			Globals.set('chars_to_quote', "A-Z:")
 			Globals.set('quoting_enabled', 1)
+			Globals.set('preserve_hardlinks', 0)
 			select_opts.append(("--exclude-special-files", None))
 		elif opt == '--windows-time-format':
 			Globals.set('time_separator', "_")
diff --git a/rdiff-backup/src/destructive_stepping.py b/rdiff-backup/src/destructive_stepping.py
index 60fc4e9..1688f7c 100644
--- a/rdiff-backup/src/destructive_stepping.py
+++ b/rdiff-backup/src/destructive_stepping.py
@@ -54,6 +54,7 @@ class DSRPath(RPath):
 			assert isinstance(conn_or_rp, RPath)
 			RPath.__init__(self, conn_or_rp.conn,
 						   conn_or_rp.base, conn_or_rp.index)
+			self.path = conn_or_rp.path # conn_or_rp may be quoted
 		else: RPath.__init__(self, conn_or_rp, base, index)
 
 		if source != "bypass":
diff --git a/rdiff-backup/src/selection.py b/rdiff-backup/src/selection.py
index 6305b02..6c59ccc 100644
--- a/rdiff-backup/src/selection.py
+++ b/rdiff-backup/src/selection.py
@@ -197,7 +197,8 @@ class Select:
 
 		if self.quoting_on:
 			for subdir in FilenameMapping.get_quoted_dir_children(dsrpath):
-				for dsrp in rec_func(subdir, rec_func, sel_func): yield dsrp
+				for dsrp in rec_func(subdir, rec_func, sel_func):
+					yield dsrp
 		else:
 			for filename in Robust.listrp(dsrpath):
 				new_dsrp = Robust.check_common_error(