summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2006-01-16 04:09:50 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2006-01-16 04:09:50 +0000
commit7339bacebca37694ac5f6e931368a9494eaff8f1 (patch)
treecbfb8d36df0424792fb90d127bf1b1dde8cce169
parentaa5468939fa402e375eea52c4da9b3e46e440d30 (diff)
downloadrdiff-backup-7339bacebca37694ac5f6e931368a9494eaff8f1.tar.gz
Final changes for 1.0.4
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-0@748 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG4
-rw-r--r--rdiff-backup/testing/regresstest.py2
-rw-r--r--rdiff-backup/testing/roottest.py14
-rw-r--r--rdiff-backup/testing/securitytest.py6
4 files changed, 13 insertions, 13 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 26bcbc4..e195cb2 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,4 +1,4 @@
-New in v1.0.4 (????/??/??)
+New in v1.0.4 (2006/01/15)
--------------------------
Files with ACLs will not be unnecessarily marked as changed (bug
@@ -12,7 +12,7 @@ excluded if certain include expressions involving a non-trailing '**'
were used. Bug reported by Toni Price.
Bug #15436 reported by Remy Blank: rdiff-backup would sometimes crash
-if ACLs and uname did not exist on destination.
+on ACLs if the owning uname did not exist on destination.
New in v1.0.3 (2005/11/25)
diff --git a/rdiff-backup/testing/regresstest.py b/rdiff-backup/testing/regresstest.py
index 4920a7e..b6a2d5b 100644
--- a/rdiff-backup/testing/regresstest.py
+++ b/rdiff-backup/testing/regresstest.py
@@ -106,7 +106,7 @@ class RegressTest(unittest.TestCase):
marker.touch()
self.change_unreadable()
- cmd = "rdiff-backup --check-destination-dir " + self.output_rp.path
+ cmd = "../rdiff-backup --check-destination-dir " + self.output_rp.path
print "Executing:", cmd
assert not os.system(cmd)
diff --git a/rdiff-backup/testing/roottest.py b/rdiff-backup/testing/roottest.py
index 4950993..8d7f262 100644
--- a/rdiff-backup/testing/roottest.py
+++ b/rdiff-backup/testing/roottest.py
@@ -201,8 +201,8 @@ class HalfRoot(unittest.TestCase):
in_rp1, in_rp2 = self.make_dirs()
outrp = rpath.RPath(Globals.local_connection, "testfiles/output")
if outrp.lstat(): outrp.delete()
- remote_schema = 'su -c "rdiff-backup --server" %s' % (user,)
- cmd_schema = ("rdiff-backup -v" + str(verbosity) +
+ remote_schema = 'su -c "../rdiff-backup --server" %s' % (user,)
+ cmd_schema = ("../rdiff-backup -v" + str(verbosity) +
" --current-time %s --remote-schema '%%s' %s '%s'::%s")
cmd1 = cmd_schema % (10000, in_rp1.path, remote_schema, outrp.path)
@@ -221,7 +221,7 @@ class HalfRoot(unittest.TestCase):
rout_rp = rpath.RPath(Globals.local_connection,
"testfiles/restore_out")
- restore_schema = ("rdiff-backup -v" + str(verbosity) +
+ restore_schema = ("../rdiff-backup -v" + str(verbosity) +
" -r %s --remote-schema '%%s' '%s'::%s %s")
Myrm(rout_rp.path)
cmd3 = restore_schema % (10000, remote_schema, outrp.path,
@@ -244,7 +244,7 @@ class HalfRoot(unittest.TestCase):
assert outrp_perms == 0, outrp_perms
self.cause_regress(outrp)
- cmd5 = ('su -c "rdiff-backup --check-destination-dir %s" %s' %
+ cmd5 = ('su -c "../rdiff-backup --check-destination-dir %s" %s' %
(outrp.path, user))
print "Executing regress: ", cmd5
assert not os.system(cmd5)
@@ -286,7 +286,7 @@ class NonRoot(unittest.TestCase):
def backup(self, input_rp, output_rp, time):
global user
- backup_cmd = ("rdiff-backup --no-compare-inode "
+ backup_cmd = ("../rdiff-backup --no-compare-inode "
"--current-time %s %s %s" %
(time, input_rp.path, output_rp.path))
Run("su %s -c '%s'" % (user, backup_cmd))
@@ -295,8 +295,8 @@ class NonRoot(unittest.TestCase):
assert restore_rp.path == "testfiles/rest_out"
Myrm(restore_rp.path)
if time is None: time = "now"
- restore_cmd = "rdiff-backup -r %s %s %s" % (time, dest_rp.path,
- restore_rp.path,)
+ restore_cmd = "../rdiff-backup -r %s %s %s" % (time, dest_rp.path,
+ restore_rp.path,)
Run(restore_cmd)
def test_non_root(self):
diff --git a/rdiff-backup/testing/securitytest.py b/rdiff-backup/testing/securitytest.py
index 4c566dc..8a8df4c 100644
--- a/rdiff-backup/testing/securitytest.py
+++ b/rdiff-backup/testing/securitytest.py
@@ -73,12 +73,12 @@ class SecurityTest(unittest.TestCase):
extra_args = "", success = 1, current_time = None):
"""Run rdiff-backup locally, with given restrict settings"""
if not current_time: current_time = int(time.time())
- prefix = ('rdiff-backup --current-time %s ' % (current_time,) +
+ prefix = ('../rdiff-backup --current-time %s ' % (current_time,) +
'--remote-schema %s ')
- if in_local: out_dir = ("'rdiff-backup %s --server'::%s" %
+ if in_local: out_dir = ("'../rdiff-backup %s --server'::%s" %
(restrict_args, out_dir))
- else: in_dir = ("'rdiff-backup %s --server'::%s" %
+ else: in_dir = ("'../rdiff-backup %s --server'::%s" %
(restrict_args, in_dir))
cmdline = "%s %s %s %s" % (prefix, extra_args, in_dir, out_dir)