[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/Main.py rdi..
From: |
Andrew Ferguson |
Subject: |
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/Main.py rdi... |
Date: |
Fri, 27 Mar 2009 21:31:11 +0000 |
CVSROOT: /sources/rdiff-backup
Module name: rdiff-backup
Changes by: Andrew Ferguson <owsla> 09/03/27 21:31:11
Modified files:
. : CHANGELOG
rdiff_backup : Main.py SetConnections.py
Log message:
Allow --test-server to be used with --restrict again.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.368&r2=1.369
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Main.py?cvsroot=rdiff-backup&r1=1.136&r2=1.137
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/SetConnections.py?cvsroot=rdiff-backup&r1=1.19&r2=1.20
Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -b -r1.368 -r1.369
--- CHANGELOG 16 Mar 2009 14:35:45 -0000 1.368
+++ CHANGELOG 27 Mar 2009 21:31:11 -0000 1.369
@@ -1,3 +1,10 @@
+New in v1.3.4 (????/??/??)
+---------------------------
+
+Allow --test-server option to be combined with --restrict. Thanks to Nick
+Moffitt for reporting the error. Closes Ubuntu bug #349072. (Andrew Ferguson)
+
+
New in v1.3.3 (2009/03/16)
---------------------------
Index: rdiff_backup/Main.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- rdiff_backup/Main.py 9 Mar 2009 14:27:18 -0000 1.136
+++ rdiff_backup/Main.py 27 Mar 2009 21:31:11 -0000 1.137
@@ -290,7 +290,7 @@
elif action == "remove-older-than": RemoveOlderThan(rps[0])
elif action == "restore": Restore(*rps)
elif action == "restore-as-of": Restore(rps[0], rps[1], 1)
- elif action == "test-server": SetConnections.TestConnections()
+ elif action == "test-server": SetConnections.TestConnections(rps)
elif action == "verify": Verify(rps[0])
else: raise AssertionError("Unknown action " + action)
Index: rdiff_backup/SetConnections.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/SetConnections.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- rdiff_backup/SetConnections.py 8 Jan 2009 21:03:44 -0000 1.19
+++ rdiff_backup/SetConnections.py 27 Mar 2009 21:31:11 -0000 1.20
@@ -241,19 +241,24 @@
Globals.backup_reader = Globals.isbackup_reader = \
Globals.backup_writer = Globals.isbackup_writer = None
-def TestConnections():
+def TestConnections(rpaths):
"""Test connections, printing results"""
if len(Globals.connections) == 1: print "No remote connections
specified"
else:
- for i in range(1, len(Globals.connections)): test_connection(i)
+ assert len(Globals.connection) == len(rpaths) + 1
+ for i in range(1, len(Globals.connections)):
+ test_connection(i, rpaths[i-1])
-def test_connection(conn_number):
+def test_connection(conn_number, rp):
"""Test connection. conn_number 0 is the local connection"""
print "Testing server started by: ", __conn_remote_cmds[conn_number]
conn = Globals.connections[conn_number]
try:
assert conn.Globals.get('current_time') is None
- assert type(conn.os.listdir('.')) is list
+ try:
+ assert type(conn.os.getuid()) is int
+ except AttributeError: # Windows doesn't support os.getuid()
+ assert type(conn.os.listdir(rp.path)) is list
version = conn.Globals.get('version')
except:
sys.stderr.write("Server tests failed\n")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/Main.py rdi...,
Andrew Ferguson <=