Skip to content
Permalink
Browse files

Added a couple small patches to correct some crashing problems with

character quoting code. Patches have been submitted to the author for
inclusion in official code.
Bumped revision.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@7545 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
Robert Shaw
Robert Shaw committed Jun 17, 2004
1 parent c57cebd commit 98563eddc99142ea22a3c9049e58bd7f0a485a90
@@ -1,9 +1,9 @@
# $Id: Portfile,v 1.3 2004/06/16 22:24:57 rshaw Exp $
# $Id: Portfile,v 1.4 2004/06/17 04:11:19 rshaw Exp $
PortSystem 1.0
PortGroup python 1.0
name py-rdiff-backup
version 0.12.6
revision 1
revision 2
categories-append net
maintainers rshaw@opendarwin.org
description backs up one directory to another, possibly over a network
@@ -43,6 +43,9 @@ variant devel {
version 0.13.4
checksums md5 43a5e98751371fb1852fb2ebeed38e77
distname rdiff-backup-${version}

patchfiles-append patch-Main.py \
patch-fs_abilities.py
}

variant cvs {
@@ -58,5 +61,8 @@ variant cvs {
| tar xvf - -C ${workpath}"
}
worksrcdir ${cvs.module}-${version}

patchfiles-append patch-Main.py \
patch-fs_abilities.py
}

@@ -0,0 +1,20 @@
--- rdiff_backup/Main.py.orig Wed Jun 16 21:01:27 2004
+++ rdiff_backup/Main.py Wed Jun 16 21:00:42 2004
@@ -502,7 +502,7 @@
if src_support: Globals.rbdir.conn.Globals.set_local(conn_attr, 1)

target_fsa = target.conn.fs_abilities.get_fsabilities_readwrite(
- 'destination', target, 0)
+ 'destination', target, 0, Globals.chars_to_quote)
Log(str(target_fsa), 3)
mirror_fsa = Globals.rbdir.conn.fs_abilities.get_fsabilities_restoresource(
Globals.rbdir)
@@ -687,7 +687,7 @@
SetConnections.UpdateGlobal(write_attr, 1)
rbdir.conn.Globals.set_local(conn_attr, 1)

- fsa = rbdir.conn.fs_abilities.get_fsabilities_readwrite('archive', rbdir)
+ fsa = rbdir.conn.fs_abilities.get_fsabilities_readwrite('archive', rbdir, 1, Globals.chars_to_quote)
Log(str(fsa), 3)

update_triple(fsa.eas, ('eas_active', 'eas_write', 'eas_conn'))
@@ -0,0 +1,11 @@
--- rdiff_backup/fs_abilities.py.orig Wed Jun 16 21:01:33 2004
+++ rdiff_backup/fs_abilities.py Wed Jun 16 21:00:42 2004
@@ -174,7 +174,7 @@
log.Log("Warning: File system no longer needs quoting, "
"but will retain for backwards compatibility.", 2)
self.chars_to_quote = old_chars
- else: log.FatalError("""New quoting requirements
+ else: log.Log.FatalError("""New quoting requirements

This may be caused when you copy an rdiff-backup directory from a
normal file system on to a windows one that cannot support the same

0 comments on commit 98563ed

Please sign in to comment.
You can’t perform that action at this time.