From 0b04891044ac699108e7d303a85fef04ba0a7d5c Mon Sep 17 00:00:00 2001 From: owsla Date: Thu, 9 Oct 2008 20:23:42 +0000 Subject: Print a more informative error message if the user's remote shell prints extraneous information before rdiff-backup runs. git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@948 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/CHANGELOG | 3 +++ rdiff-backup/rdiff_backup/SetConnections.py | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG index e2f54b0..2662860 100644 --- a/rdiff-backup/CHANGELOG +++ b/rdiff-backup/CHANGELOG @@ -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) diff --git a/rdiff-backup/rdiff_backup/SetConnections.py b/rdiff-backup/rdiff_backup/SetConnections.py index 176dd6a..465fcb3 100644 --- a/rdiff-backup/rdiff_backup/SetConnections.py +++ b/rdiff-backup/rdiff_backup/SetConnections.py @@ -164,6 +164,19 @@ installed in the PATH on the remote system. See the man page for more 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 """ % (remote_cmd, + remote_cmd.replace("--server", "--version"))) if remote_version != Globals.version: Log("Warning: Local version %s does not match remote version %s." -- cgit v1.2.1