summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-08-14 06:47:17 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-08-14 06:47:17 +0000
commit7253284d18fe63dd7d2c56bc19df8d9da6ca7b4b (patch)
tree0caa814a0777ea56a39262e282582c37c5f98671
parent2429ac3b577dfc3ebc9f90f27acc4d00a5ae9620 (diff)
downloadrdiff-backup-7253284d18fe63dd7d2c56bc19df8d9da6ca7b4b.tar.gz
Misc final changes for v1.0.0
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@613 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG4
-rwxr-xr-xrdiff-backup/rdiff-backup2
-rw-r--r--rdiff-backup/rdiff_backup/Main.py10
-rw-r--r--rdiff-backup/testing/fs_abilitiestest.py2
4 files changed, 9 insertions, 9 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index ae81a47..d275d38 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,5 +1,5 @@
-New in v0.13.7 (????/??/??)
----------------------------
+New in v1.0.0 (2005/08/14)
+--------------------------
Handle cases of junk uid/gids better on 64bit systems. (Bug report by
Nick Bailey)
diff --git a/rdiff-backup/rdiff-backup b/rdiff-backup/rdiff-backup
index 48c67df..54f5a18 100755
--- a/rdiff-backup/rdiff-backup
+++ b/rdiff-backup/rdiff-backup
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# rdiff-backup -- Mirror files while keeping incremental changes
# Version $version released $date
-# Copyright (C) 2001, 2002, 2003 Ben Escoto <bescoto@stanford.edu>
+# Copyright (C) 2001-2005 Ben Escoto <bescoto@stanford.edu>
#
# This program is licensed under the GNU General Public License (GPL).
# you can redistribute it and/or modify it under the terms of the GNU
diff --git a/rdiff-backup/rdiff_backup/Main.py b/rdiff-backup/rdiff_backup/Main.py
index c9ccc59..58825b2 100644
--- a/rdiff-backup/rdiff_backup/Main.py
+++ b/rdiff-backup/rdiff_backup/Main.py
@@ -411,10 +411,10 @@ def backup_set_fs_globals(rpin, rpout):
rpout.conn.Globals.set_local(conn_attr, 1)
src_fsa = rpin.conn.fs_abilities.get_fsabilities_readonly('source', rpin)
- Log(str(src_fsa), 3)
+ Log(str(src_fsa), 4)
dest_fsa = rpout.conn.fs_abilities.get_fsabilities_readwrite(
'destination', Globals.rbdir, 1, Globals.chars_to_quote)
- Log(str(dest_fsa), 3)
+ Log(str(dest_fsa), 4)
update_triple(src_fsa.eas, dest_fsa.eas,
('eas_active', 'eas_write', 'eas_conn'))
@@ -518,10 +518,10 @@ def restore_set_fs_globals(target):
target_fsa = target.conn.fs_abilities.get_fsabilities_readwrite(
'destination', target, 0, Globals.chars_to_quote)
- Log(str(target_fsa), 3)
+ Log(str(target_fsa), 4)
mirror_fsa = Globals.rbdir.conn.fs_abilities.get_fsabilities_restoresource(
Globals.rbdir)
- Log(str(mirror_fsa), 3)
+ Log(str(mirror_fsa), 4)
update_triple(mirror_fsa.eas, target_fsa.eas,
('eas_active', 'eas_write', 'eas_conn'))
@@ -705,7 +705,7 @@ def single_set_fs_globals(rbdir):
fsa = rbdir.conn.fs_abilities.get_fsabilities_readwrite('archive',
rbdir, 1, Globals.chars_to_quote)
- Log(str(fsa), 3)
+ Log(str(fsa), 4)
update_triple(fsa.eas, ('eas_active', 'eas_write', 'eas_conn'))
update_triple(fsa.acls, ('acls_active', 'acls_write', 'acls_conn'))
diff --git a/rdiff-backup/testing/fs_abilitiestest.py b/rdiff-backup/testing/fs_abilitiestest.py
index 61e80c1..da7198a 100644
--- a/rdiff-backup/testing/fs_abilitiestest.py
+++ b/rdiff-backup/testing/fs_abilitiestest.py
@@ -13,7 +13,7 @@ class FSAbilitiesTest(unittest.TestCase):
"""
# Describes standard linux file system without acls/eas
dir_to_test = "testfiles"
- eas = acls = 0
+ eas = acls = 1
chars_to_quote = ""
ownership = (os.getuid() == 0)
hardlinks = fsync_dirs = 1