[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/SetConnecti...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/10/09 20:23:42

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : SetConnections.py 

Log message:
        Print a more informative error message if the user's remote shell prints
        extraneous information before rdiff-backup runs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.309&r2=1.310
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/SetConnections.py?cvsroot=rdiff-backup&r1=1.17&r2=1.18

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -b -r1.309 -r1.310
--- CHANGELOG   7 Oct 2008 23:45:41 -0000       1.309
+++ CHANGELOG   9 Oct 2008 20:23:41 -0000       1.310
@@ -1,6 +1,9 @@
 New in v1.2.2 (????/??/??)
 ---------------------------
 
+Print a more informative error message if the user's remote shell prints
+extraneous information before rdiff-backup runs. (Andrew Ferguson)
+
 Don't backup Windows ACLs if the --no-acls option is specified. Thanks to
 Richard Metzger for reporting the issue. (Andrew Ferguson)
 

Index: rdiff_backup/SetConnections.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/SetConnections.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- rdiff_backup/SetConnections.py      13 Apr 2008 11:25:22 -0000      1.17
+++ rdiff_backup/SetConnections.py      9 Oct 2008 20:23:42 -0000       1.18
@@ -164,6 +164,19 @@
 information on this.  This message may also be displayed if the remote
 version of rdiff-backup is quite different from the local version (%s)."""
                                           % (exception, remote_cmd, 
Globals.version))
+       except OverflowError, exc:
+               Log.FatalError("""Integer overflow while attempting to 
establish the 
+remote connection by executing
+
+    %s
+
+Please make sure that nothing is printed (e.g., by your login shell) when this
+command executes. Try running this command:
+
+    %s
+       
+which should only print out the text: rdiff-backup <version>""" % (remote_cmd,
+       remote_cmd.replace("--server", "--version")))
                
        if remote_version != Globals.version:
                Log("Warning: Local version %s does not match remote version 
%s."