Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4618/10.4-transitional/unstable/main/finkinfo/utils
Modified Files:
rdiff-backup.info rdiff-backup.patch
Log Message:
New upstream version.
Include upstream patch for carbon file support.
Index: rdiff-backup.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/rdiff-backup.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- rdiff-backup.patch 1 Nov 2005 02:30:41 -0000 1.7
+++ rdiff-backup.patch 6 Nov 2005 21:24:52 -0000 1.8
@@ -15,93 +15,29 @@
-
+ data_files = [('share/man/man1', ['rdiff-backup.1'])])
-# Patch from
-#
http://savannah.nongnu.org/cgi-bin/viewcvs/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py.diff?r2=1.21&r1=1.20&diff_format=u
-
-diff -u -r1.20 -r1.21
---- rdiff-backup-1.1.0/rdiff_backup/fs_abilities.py 2005/10/25 06:43:23
1.20
-+++ rdiff-backup-1.1.0/rdiff_backup/fs_abilities.py 2005/10/26 00:52:53
1.21
-@@ -436,8 +436,8 @@
- self.update_triple(self.src_fsa.carbonfile,
self.dest_fsa.carbonfile,
- ('carbonfile_active', 'carbonfile_write',
'carbonfile_conn'))
- if self.src_fsa.carbonfile and not Globals.carbonfile_active:
-- Log("Source may have carbonfile support, but support
defaults to "
-- "off.\n Use --carbonfile to enable.", 5)
-+ log.Log("Source may have carbonfile support, but
support "
-+ "defaults to off.\n Use --carbonfile
to enable.", 5)
-
- def set_hardlinks(self):
- if Globals.preserve_hardlinks != 0:
+http://savannah.nongnu.org/cgi-bin/viewcvs/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py.diff?r2=1.95&r1=1.94&diff_format=u
===================================================================
-RCS file:
/cvsroot/rdiff-backup/cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
-retrieving revision 1.21
-retrieving revision 1.22
-diff -u -r1.21 -r1.22
---- rdiff-backup-1.1.0/rdiff_backup/fs_abilities.py 2005/10/26 00:52:53
1.21
-+++ rdiff-backup-1.1.0/rdiff_backup/fs_abilities.py 2005/10/26 17:42:17
1.22
-@@ -514,7 +514,8 @@
- return actual_ctq
- log.Log.FatalError("""New quoting requirements!
-
--The quoting this session appears to need do not match those in
-+The quoting chars this session needs (%s) do not match
-+the repository settings (%s) listed in
-
- %s
-
-@@ -522,10 +523,7 @@
- normal file system onto a windows one that cannot support the same
- characters, or if you backup a case-sensitive file system onto a
- case-insensitive one that previously only had case-insensitive ones
--backed up onto it.
--
--If you want to risk it, remove the file
--rdiff-backup-data/chars_to_quote.""" % (ctq_rp.path,))
-+backed up onto it.""" % (suggested_ctq, actual_ctq, ctq_rp.path))
+RCS file:
/cvsroot/rdiff-backup/cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py,v
+retrieving revision 1.94
+retrieving revision 1.95
+diff -u -r1.94 -r1.95
+--- rdiff-backup/rdiff_backup/rpath.py 2005/11/06 01:46:54 1.94
++++ rdiff-backup/rdiff_backup/rpath.py 2005/11/06 06:51:17 1.95
+@@ -1239,7 +1239,7 @@
+ from Carbon.File import FSSpec
+ import MacOS
+ try:
+- fsobj = FSSpec(self.path)
++ fsobj = FSSpec(rpath.path)
+ finderinfo = fsobj.FSpGetFInfo()
+ cfile = {'creator': finderinfo.Creator,
+ 'type': finderinfo.Type,
+@@ -1248,7 +1248,7 @@
+ return cfile
+ except MacOS.Error:
+ log.Log("Cannot read carbonfile information from %s" %
+- (self.path,), 2)
++ (rpath.path,), 2)
+ return None
- class RestoreSetGlobals(SetGlobals):
-===================================================================
-RCS file:
/cvsroot/rdiff-backup/cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
-retrieving revision 1.22
-retrieving revision 1.23
-diff -c -r1.22 -r1.23
-*** rdiff-backup-1.1.0/rdiff_backup/fs_abilities.py 2005/10/26 17:42:17
1.22
---- rdiff-backup-1.1.0/rdiff_backup/fs_abilities.py 2005/10/30 15:43:42
1.23
-***************
-*** 199,205 ****
- assert ord_rp.lstat()
- ord_rp.delete()
-
-! extended_filename = ':\\' + chr(175)
- try:
- ext_rp = subdir.append(extended_filename)
- ext_rp.touch()
---- 199,206 ----
- assert ord_rp.lstat()
- ord_rp.delete()
-
-! # Try a UTF-8 encoded character
-! extended_filename = ':\\ ' + chr(225) + chr(132) + chr(137)
- try:
- ext_rp = subdir.append(extended_filename)
- ext_rp.touch()
-***************
-*** 423,430 ****
- self.update_triple(self.src_fsa.acls, self.dest_fsa.acls,
- ('acls_active',
'acls_write', 'acls_conn'))
- if Globals.never_drop_acls and not Globals.acls_active:
-! Log.FatalError("--never-drop-acls specified, but ACL
support\n"
-! "missing from destination
filesystem")
-
- def set_resource_forks(self):
- self.update_triple(self.src_fsa.resource_forks,
---- 424,431 ----
- self.update_triple(self.src_fsa.acls, self.dest_fsa.acls,
- ('acls_active',
'acls_write', 'acls_conn'))
- if Globals.never_drop_acls and not Globals.acls_active:
-! log.Log.FatalError("--never-drop-acls specified, but
ACL support\n"
-! "missing from
destination filesystem")
-
- def set_resource_forks(self):
- self.update_triple(self.src_fsa.resource_forks,
Index: rdiff-backup.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/rdiff-backup.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rdiff-backup.info 1 Nov 2005 02:30:41 -0000 1.8
+++ rdiff-backup.info 6 Nov 2005 21:24:52 -0000 1.9
@@ -1,6 +1,6 @@
Package: rdiff-backup
-Version: 1.1.0
-Revision: 4
+Version: 1.1.2
+Revision: 1
Description: Backup using mirrors and incrementals
License: GPL
Homepage: http://www.nongnu.org/rdiff-backup/
@@ -12,7 +12,7 @@
# Unpack Phase.
Source: http://savannah.nongnu.org/download/%n/%n-%v.tar.gz
-Source-MD5: 46719a7c244d5c16c919a43f45b6525f
+Source-MD5: abf1ebdcbf24cabfa11c3f335a9cba61
# Patch Phase.
Patch: %n.patch
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
