diff options
| author | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-07-09 03:53:40 +0000 |
|---|---|---|
| committer | owsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109> | 2007-07-09 03:53:40 +0000 |
| commit | 2492280ff6d81bb7862ce9b3d51e02be9603ab7d (patch) | |
| tree | a368969954d6cc5a624ee093aafadac4996564d3 /rdiff-backup/rdiff_backup/connection.py | |
| parent | 52d3dc08b78a8210a50cc688a735341706dd4159 (diff) | |
| download | rdiff-backup-2492280ff6d81bb7862ce9b3d51e02be9603ab7d.tar.gz | |
Squash regress/check_pids bug and properly pickle RPath's
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@815 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/connection.py')
| -rw-r--r-- | rdiff-backup/rdiff_backup/connection.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rdiff-backup/rdiff_backup/connection.py b/rdiff-backup/rdiff_backup/connection.py index dadbcd5..0ba1204 100644 --- a/rdiff-backup/rdiff_backup/connection.py +++ b/rdiff-backup/rdiff_backup/connection.py @@ -20,7 +20,7 @@ """Support code for remote execution and data transfer""" from __future__ import generators -import types, os, tempfile, cPickle, shutil, traceback, pickle, \ +import types, os, tempfile, cPickle, shutil, traceback, \ socket, sys, gzip # The following EA and ACL modules may be used if available try: import xattr @@ -140,8 +140,7 @@ class LowLevelPipeConnection(Connection): def _putobj(self, obj, req_num): """Send a generic python obj down the outpipe""" - # for some reason there is an error when cPickle is used below.. - self._write("o", pickle.dumps(obj, 1), req_num) + self._write("o", cPickle.dumps(obj, 1), req_num) def _putbuf(self, buf, req_num): """Send buffer buf down the outpipe""" |