[cedar-backup-svn] SF.net SVN: cedar-backup: [904] cedar-backup2/trunk
Brought to you by:
pronovic
Menu
▾
▴
[cedar-backup-svn] SF.net SVN: cedar-backup: [904] cedar-backup2/trunk
|
From: <pro...@us...> - 2008-04-01 01:01:26
|
Revision: 904
http://cedar-backup.svn.sourceforge.net/cedar-backup/?rev=904&view=rev
Author: pronovic
Date: 2008-03-31 18:01:18 -0700 (Mon, 31 Mar 2008)
Log Message:
-----------
Fixed problem with link_depth (closes: #1930729)
Modified Paths:
--------------
cedar-backup2/trunk/CedarBackup2/filesystem.py
cedar-backup2/trunk/Changelog
cedar-backup2/trunk/test/filesystemtests.py
Modified: cedar-backup2/trunk/CedarBackup2/filesystem.py
===================================================================
--- cedar-backup2/trunk/CedarBackup2/filesystem.py 2008-03-21 03:04:24 UTC (rev 903)
+++ cedar-backup2/trunk/CedarBackup2/filesystem.py 2008-04-01 01:01:18 UTC (rev 904)
@@ -424,7 +424,8 @@
The linkDepth parameter controls whether soft links are followed when we
are adding the contents recursively. Any recursive calls reduce the
value by one. If the value zero or less, then soft links will just be
- added as directories, but will not be followed.
+ added as directories, but will not be followed. This means that links
+ are followed to a I{constant depth} starting from the top-most directory.
@param path: Directory path whose contents should be added to the list.
@param includePath: Indicates whether to include the path as well as contents.
@@ -463,7 +464,7 @@
if os.path.islink(entrypath):
if recursive and linkDepth > 0:
newDepth = linkDepth - 1;
- added += self._addDirContentsInternal(entrypath, linkDepth=newDepth)
+ added += self._addDirContentsInternal(entrypath, includePath=False, linkDepth=newDepth)
else:
added += self.addDir(entrypath)
else:
Modified: cedar-backup2/trunk/Changelog
===================================================================
--- cedar-backup2/trunk/Changelog 2008-03-21 03:04:24 UTC (rev 903)
+++ cedar-backup2/trunk/Changelog 2008-04-01 01:01:18 UTC (rev 904)
@@ -4,6 +4,9 @@
* Updated user manual
- Brought copyright notices up-to-date
- Fixed various URLs that didn't reference SourceForge
+ * Fixed problem with link_depth (closes: #1930729).
+ - Can't add links directly, they're implicitly added later by tar
+ - Changed FilesystemList to use includePath=false for recursive links
Version 2.17.0 20 Mar 2008
Modified: cedar-backup2/trunk/test/filesystemtests.py
===================================================================
--- cedar-backup2/trunk/test/filesystemtests.py 2008-03-21 03:04:24 UTC (rev 903)
+++ cedar-backup2/trunk/test/filesystemtests.py 2008-04-01 01:01:18 UTC (rev 904)
@@ -4884,8 +4884,8 @@
self.failUnless(self.buildPath([ "tree6", "file002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link001", ]) in fsList)
else:
- self.failUnlessEqual(165, count)
- self.failUnlessEqual(165, len(fsList))
+ self.failUnlessEqual(164, count)
+ self.failUnlessEqual(164, len(fsList))
self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir003", ]) in fsList)
@@ -5017,7 +5017,6 @@
self.failUnless(self.buildPath([ "tree6", "dir003", "link003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link004", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link005", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "dir002", ]) in fsList)
@@ -5185,8 +5184,8 @@
self.failUnless(self.buildPath([ "tree6", "file002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link001", ]) in fsList)
else:
- self.failUnlessEqual(247, count)
- self.failUnlessEqual(247, len(fsList))
+ self.failUnlessEqual(240, count)
+ self.failUnlessEqual(240, len(fsList))
self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "dir001", "dir003", ]) in fsList)
@@ -5214,7 +5213,9 @@
self.failUnless(self.buildPath([ "tree6", "dir001", "file002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "file003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "file004", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir001", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir001", "link003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "dir003", ]) in fsList)
@@ -5229,9 +5230,6 @@
self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "link001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "link002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir001", "link001", "link003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir001", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir001", "link002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir001", "link003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "dir003", ]) in fsList)
@@ -5281,6 +5279,13 @@
self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "dir003", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link004", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "dir003", ]) in fsList)
@@ -5293,6 +5298,11 @@
self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file007", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file008", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir002", "link002", "link005", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file001", ]) in fsList)
@@ -5302,24 +5312,10 @@
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file005", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file006", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "file007", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "link005", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "link001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "link002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "link003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir002", "link005", "link004", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link001", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link004", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "dir001", "link005", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "file001", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "file002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "file003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "link001", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "link003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir002", "link004", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "dir001", "file001", ]) in fsList)
@@ -5346,6 +5342,20 @@
self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "dir002", "link004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file005", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file006", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file007", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file008", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "file009", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "dir003", "link005", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link001", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link001", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link001", "file001", ]) in fsList)
@@ -5353,7 +5363,6 @@
self.failUnless(self.buildPath([ "tree6", "dir003", "link001", "file003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link001", "file004", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link001", "file005", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "link001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link001", "link001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link001", "link002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link001", "link003", ]) in fsList)
@@ -5369,25 +5378,8 @@
self.failUnless(self.buildPath([ "tree6", "dir003", "link004", "file007", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link004", "file008", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link004", "file009", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "link004", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link004", "link001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "dir003", "link004", "link002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "file001", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "file002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "file003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "file004", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "file005", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "file006", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "file007", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "file008", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "file009", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "ignore", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "link002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "link003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "dir003", "link005", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "dir003", ]) in fsList)
@@ -5399,18 +5391,24 @@
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "file006", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "file007", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "ignore", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "link001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "link002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir001", "link003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "file001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "file002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "link001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "dir002", "link002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", "link001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "file001", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "file002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "file003", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "file004", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "link002", ]) in fsList)
+ self.failUnless(self.buildPath([ "tree6", "link002", "link003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "link001", "dir001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "link001", "dir002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "link001", "dir003", ]) in fsList)
@@ -5425,12 +5423,6 @@
self.failUnless(self.buildPath([ "tree6", "link002", "link001", "link001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "link001", "link002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link002", "link001", "link003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", "file001", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", "file002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", "file003", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", "file004", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", "link002", ]) in fsList)
- self.failUnless(self.buildPath([ "tree6", "link002", "link003", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "file001", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "file002", ]) in fsList)
self.failUnless(self.buildPath([ "tree6", "link001", ]) in fsList)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
