diff options
Diffstat (limited to 'rdiff-backup/rdiff_backup')
-rw-r--r-- | rdiff-backup/rdiff_backup/highlevel.py | 11 | ||||
-rw-r--r-- | rdiff-backup/rdiff_backup/robust.py | 2 | ||||
-rw-r--r-- | rdiff-backup/rdiff_backup/rpath.py | 14 |
3 files changed, 14 insertions, 13 deletions
diff --git a/rdiff-backup/rdiff_backup/highlevel.py b/rdiff-backup/rdiff_backup/highlevel.py index 660d8fe..4ee7e48 100644 --- a/rdiff-backup/rdiff_backup/highlevel.py +++ b/rdiff-backup/rdiff_backup/highlevel.py @@ -21,17 +21,6 @@ from rorpiter import * import Globals, Hardlink, MiscStats -class SkipFileException(Exception): - """Signal that the current file should be skipped but then continue - - This exception will often be raised when there is problem reading - an individual file, but it makes sense for the rest of the backup - to keep going. - - """ - pass - - class HighLevel: """High level static functions diff --git a/rdiff-backup/rdiff_backup/robust.py b/rdiff-backup/rdiff_backup/robust.py index 5726914..8ba122e 100644 --- a/rdiff-backup/rdiff_backup/robust.py +++ b/rdiff-backup/rdiff_backup/robust.py @@ -39,7 +39,7 @@ able to narrow down the possibilities. import tempfile, errno, signal, cPickle, C from static import * - +from rpath import * class RobustAction: """Represents a file operation to be accomplished later""" diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py index 14a68c7..426170c 100644 --- a/rdiff-backup/rdiff_backup/rpath.py +++ b/rdiff-backup/rdiff_backup/rpath.py @@ -20,6 +20,16 @@ import os, stat, re, sys, shutil, gzip, socket from static import * +class SkipFileException(Exception): + """Signal that the current file should be skipped but then continue + + This exception will often be raised when there is problem reading + an individual file, but it makes sense for the rest of the backup + to keep going. + + """ + pass + class RPathException(Exception): pass class RPathStatic: @@ -209,7 +219,9 @@ class RPathStatic: """ assert rpath.conn is Globals.local_connection s = socket.socket(socket.AF_UNIX) - s.bind(rpath.path) + try: s.bind(rpath.path) + except socket.error, exc: + raise SkipFileException("Socket error: " + str(exc)) def gzip_open_local_read(rpath): """Return open GzipFile. See security note directly above""" |