[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/SetConnecti..
From: |
Andrew Ferguson |
Subject: |
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/SetConnecti... [r1-2] |
Date: |
Thu, 08 Jan 2009 21:03:23 +0000 |
CVSROOT: /sources/rdiff-backup
Module name: rdiff-backup
Branch: r1-2
Changes by: Andrew Ferguson <owsla> 09/01/08 21:03:23
Modified files:
. : CHANGELOG
rdiff_backup : SetConnections.py connection.py
Log message:
Print more helpful error messages when the remote command cannot be
started
on Windows. Fix --test-server option when used with remote Windows
clients.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.338.2.2&r2=1.338.2.3
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/SetConnections.py?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.18.2.1&r2=1.18.2.2
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/connection.py?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.31&r2=1.31.2.1
Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.338.2.2
retrieving revision 1.338.2.3
diff -u -b -r1.338.2.2 -r1.338.2.3
--- CHANGELOG 7 Jan 2009 01:16:30 -0000 1.338.2.2
+++ CHANGELOG 8 Jan 2009 21:03:22 -0000 1.338.2.3
@@ -1,6 +1,12 @@
New in v1.2.6 (????/??/??)
---------------------------
+Print more helpful error messages when the remote command cannot be started
+on Windows. Thanks to Dominic for the bug report. (Andrew Ferguson)
+
+Fix --test-server option when used with remote Windows clients. Thanks to
+Thanos Diacakis for testing. (Andrew Ferguson)
+
Fix --override-chars-to-quote option. (Andrew Ferguson)
Index: rdiff_backup/SetConnections.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/SetConnections.py,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -b -r1.18.2.1 -r1.18.2.2
--- rdiff_backup/SetConnections.py 8 Jan 2009 00:17:04 -0000 1.18.2.1
+++ rdiff_backup/SetConnections.py 8 Jan 2009 21:03:23 -0000 1.18.2.2
@@ -119,7 +119,10 @@
def fill_schema(host_info):
"""Fills host_info into the schema and returns remote command"""
+ try:
return __cmd_schema % host_info
+ except TypeError:
+ Log.FatalError("Invalid remote schema:\n\n%s\n" % __cmd_schema)
def init_connection(remote_cmd):
"""Run remote_cmd, register connection, and then return it
@@ -134,10 +137,13 @@
Log("Executing " + remote_cmd, 4)
if os.name == "nt":
import subprocess
+ try:
process = subprocess.Popen(remote_cmd, shell=False, bufsize=0,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
(stdin, stdout) = (process.stdin, process.stdout)
+ except OSError:
+ (stdin, stdout) = (None, None)
else:
stdin, stdout = os.popen2(remote_cmd)
conn_number = len(Globals.connections)
@@ -152,7 +158,7 @@
def check_connection_version(conn, remote_cmd):
"""Log warning if connection has different version"""
try: remote_version = conn.Globals.get('version')
- except connection.ConnectionReadError, exception:
+ except connection.ConnectionError, exception:
Log.FatalError("""%s
Couldn't start up the remote connection by executing
@@ -247,9 +253,7 @@
conn = Globals.connections[conn_number]
try:
assert conn.Globals.get('current_time') is None
- assert type(conn.os.name) is str
- if (conn.os.name != 'nt'):
- assert type(conn.os.getuid()) is int
+ assert type(conn.os.listdir('.')) is list
version = conn.Globals.get('version')
except:
sys.stderr.write("Server tests failed\n")
Index: rdiff_backup/connection.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/connection.py,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -b -r1.31 -r1.31.2.1
--- rdiff_backup/connection.py 24 Sep 2008 00:25:47 -0000 1.31
+++ rdiff_backup/connection.py 8 Jan 2009 21:03:23 -0000 1.31.2.1
@@ -203,7 +203,7 @@
C.long2str(long(len(data))))
self.outpipe.write(data)
self.outpipe.flush()
- except IOError: raise ConnectionWriteError()
+ except (IOError, AttributeError): raise ConnectionWriteError()
def _read(self, length):
"""Read length bytes from inpipe, returning result"""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/SetConnecti... [r1-2],
Andrew Ferguson <=