[22349] trunk/dports/python/rdiff-backup-devel

[source_changes at macosforge.org]

Revision: 22349
          http://trac.macosforge.org/projects/macports/changeset/22349
Author:   blair at macports.org
Date:     2007-02-26 21:04:57 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
Apply two patches from upstream CVS:
  - Fix restore from read-only bug -- rx perms on a repository
    directory are enough, no need for write perms when restoring.
  - Fix --list-increments bug in set_must_escape_dos_devices.

Modified Paths:
--------------
    trunk/dports/python/rdiff-backup-devel/Portfile

Added Paths:
-----------
    trunk/dports/python/rdiff-backup-devel/files/patch-rdiff_backup-fs_abilities.py
    trunk/dports/python/rdiff-backup-devel/files/patch-rdiff_backup-restore.py

Modified: trunk/dports/python/rdiff-backup-devel/Portfile
===================================================================
--- trunk/dports/python/rdiff-backup-devel/Portfile	2007-02-27 05:01:34 UTC (rev 22348)
+++ trunk/dports/python/rdiff-backup-devel/Portfile	2007-02-27 05:04:57 UTC (rev 22349)
@@ -3,6 +3,7 @@
 PortGroup         python24 1.0
 name              rdiff-backup-devel
 version           1.1.9
+revision          1
 categories-append   net sysutils
 maintainers       blair at orcaware.com openmaintainer at macports.org
 
@@ -36,7 +37,9 @@
 depends_lib-append  lib:librsync:librsync
 
 patchfiles        patch-setup.py \
-                  patch-rdiff-backup.1
+                  patch-rdiff-backup.1 \
+                  patch-rdiff_backup-fs_abilities.py \
+                  patch-rdiff_backup-restore.py
 
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|" ${worksrcpath}/rdiff-backup.1

Added: trunk/dports/python/rdiff-backup-devel/files/patch-rdiff_backup-fs_abilities.py
===================================================================
--- trunk/dports/python/rdiff-backup-devel/files/patch-rdiff_backup-fs_abilities.py	                        (rev 0)
+++ trunk/dports/python/rdiff-backup-devel/files/patch-rdiff_backup-fs_abilities.py	2007-02-27 05:04:57 UTC (rev 22349)
@@ -0,0 +1,22 @@
+diff -x CVS -ru ../../rdiff-backup-r1-1-9/rdiff-backup/rdiff_backup/fs_abilities.py rdiff_backup/fs_abilities.py
+--- ../../rdiff-backup-r1-1-9/rdiff-backup/rdiff_backup/fs_abilities.py	2007-01-29 10:42:49.000000000 -0800
++++ rdiff_backup/fs_abilities.py	2007-01-31 08:12:02.000000000 -0800
+@@ -603,13 +603,16 @@
+ 
+ 	def set_must_escape_dos_devices(self, rbdir):
+ 		"""If local edd or src edd, then must escape """
++		if getattr(self, "src_fsa", None) is not None:
++			src_edd = self.src_fsa.escape_dos_devices
++		else: src_edd = 0
+ 		device_rp = rbdir.append("aux")
+ 		if device_rp.lstat(): local_edd = 1
+ 		else: local_edd = 0
+ 		SetConnections.UpdateGlobal('must_escape_dos_devices', \
+-			self.src_fsa.escape_dos_devices or local_edd)
++			src_edd or local_edd)
+ 		log.Log("Restore: must_escape_dos_devices = %d" % \
+-				(self.src_fsa.escape_dos_devices or local_edd), 4)
++				(src_edd or local_edd), 4)
+ 
+ 	def set_chars_to_quote(self, rbdir):
+ 		"""Set chars_to_quote from rdiff-backup-data dir"""

Added: trunk/dports/python/rdiff-backup-devel/files/patch-rdiff_backup-restore.py
===================================================================
--- trunk/dports/python/rdiff-backup-devel/files/patch-rdiff_backup-restore.py	                        (rev 0)
+++ trunk/dports/python/rdiff-backup-devel/files/patch-rdiff_backup-restore.py	2007-02-27 05:04:57 UTC (rev 22349)
@@ -0,0 +1,12 @@
+diff -x CVS -ru ../../rdiff-backup-r1-1-9/rdiff-backup/rdiff_backup/restore.py rdiff_backup/restore.py
+--- ../../rdiff-backup-r1-1-9/rdiff-backup/rdiff_backup/restore.py	2005-12-14 20:57:27.000000000 -0800
++++ rdiff_backup/restore.py	2007-02-03 09:32:27.000000000 -0800
+@@ -708,7 +708,7 @@
+ 		"""Change permissions of directories between old_index and index"""
+ 		for rp in self.get_new_rp_list(old_index, index):
+ 			if ((rp.isreg() and not rp.readable()) or
+-				(rp.isdir() and not rp.hasfullperms())):
++				(rp.isdir() and not (rp.executable() and rp.readable()))):
+ 				old_perms = rp.getperms()
+ 				self.open_index_list.insert(0, (rp.index, rp, old_perms))
+ 				if rp.isreg(): rp.chmod(0400 | old_perms)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070226/2f3a476d/attachment.html