summaryrefslogtreecommitdiff
path: root/rdiff-backup
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2003-01-19 09:20:19 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2003-01-19 09:20:19 +0000
commit74d982eeffd36426ca93586344c800d029193eaf (patch)
tree9c7c2c9a86bc02eec41ecfcd1bab3caf34a5cc8e /rdiff-backup
parent9d9276ef4205aef4b2ca8b5c8ecba86829845486 (diff)
downloadrdiff-backup-74d982eeffd36426ca93586344c800d029193eaf.tar.gz
Fixed socket too long error
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r0-10@261 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup')
-rw-r--r--rdiff-backup/CHANGELOG5
-rwxr-xr-xrdiff-backup/misc/myrm2
-rw-r--r--rdiff-backup/rdiff_backup/highlevel.py11
-rw-r--r--rdiff-backup/rdiff_backup/robust.py2
-rw-r--r--rdiff-backup/rdiff_backup/rpath.py14
-rw-r--r--rdiff-backup/testing/commontest.py4
6 files changed, 22 insertions, 16 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 58774a4..d7d042b 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,3 +1,8 @@
+New in v0.10.2 (2003/01/19)
+---------------------------
+
+
+
New in v0.10.1 (2002/09/16)
---------------------------
diff --git a/rdiff-backup/misc/myrm b/rdiff-backup/misc/myrm
index ddcf5bb..278b464 100755
--- a/rdiff-backup/misc/myrm
+++ b/rdiff-backup/misc/myrm
@@ -1,7 +1,7 @@
#!/usr/bin/python
import sys, os
-sys.path.insert(0, "../src")
+sys.path.insert(0, "../rdiff_backup")
from rpath import *
from connection import *
import Globals
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"""
diff --git a/rdiff-backup/testing/commontest.py b/rdiff-backup/testing/commontest.py
index 3933862..1cd2d75 100644
--- a/rdiff-backup/testing/commontest.py
+++ b/rdiff-backup/testing/commontest.py
@@ -1,12 +1,12 @@
"""commontest - Some functions and constants common to several test cases"""
import os, sys
-sys.path.insert(0, "../src")
+sys.path.insert(0, "../rdiff_backup")
from rpath import *
from destructive_stepping import *
from highlevel import *
import Globals, Hardlink, SetConnections, Main
-SourceDir = "../src"
+SourceDir = "../rdiff_backup"
AbsCurdir = os.getcwd() # Absolute path name of current directory
AbsTFdir = AbsCurdir+"/testfiles"
MiscDir = "../misc"