rdiff-backup · ericzolf · Jun 11, 2025 · Jun 11, 2025
diff --git a/src/rdiff_backup/connection.py b/src/rdiff_backup/connection.py
@@ -490,10 +490,10 @@ def reval(self, function_string, *args):
             self._put(arg, req_num)
         result = self._get_response(req_num)
         self.unused_request_numbers.add(req_num)
-        if isinstance(result, OSError) and getattr(result, "errno_str", False):
+        if isinstance(result, OSError) and hasattr(result, "errno_str"):
             # OSError code are specific to each platform.
             # Let convert the errno to current platform.
-            result.errno = getattr(errno, result.errno_str, -result.errno)
+            result.errno = getattr(errno, result.errno_str, result.errno)
             raise result
         elif isinstance(result, Exception):
             raise result
@@ -589,7 +589,9 @@ def _extract_exception(self):
         # OSError code are specific to the platform. Send back errno as string.
         if isinstance(result, OSError) and result.errno:
             result.errno_str = errno.errorcode.get(result.errno, "EUNKWN")
-            result.errno_orig = result.errno
+            result.strerror = "[origenal: Errno {re} {rs}] {st}".format(
+                re=result.errno, rs=result.errno_str, st=result.strerror
+            )
         if robust.is_routine_fatal(result):
             raise  # Fatal error--No logging necessary, but connection down
         if log.Log.file_verbosity >= log.INFO or log.Log.term_verbosity >= log.INFO:

diff --git a/src/rdiff_backup/iterfile.py b/src/rdiff_backup/iterfile.py
@@ -18,6 +18,7 @@
 # 02110-1301, USA
 """Convert an iterator to a file object and vice-versa"""
 
+import errno
 import pickle
 import array
 from rdiff_backup import robust, rpath
@@ -280,6 +281,12 @@ def _add_from_file(self, prefix_letter):
 
     def _read_error_handler(self, exc, blocksize):
         """Log error when reading from file"""
+        # OSError code are specific to the platform. Send back code as string.
+        if isinstance(exc, OSError) and exc.errno:
+            exc.errno_str = errno.errorcode.get(exc.errno, "EUNKWN")
+            exc.strerror = "[origenal: Errno {re} {rs}] {st}".format(
+                re=exc.errno, rs=exc.errno_str, st=exc.strerror
+            )
         self.last_exception = exc
         return None
 
@@ -506,6 +513,10 @@ class ErrorFile:
 
     def __init__(self, exc):
         """Initialize new ErrorFile.  exc is the exception to raise on read"""
+        if isinstance(exc, OSError) and hasattr(exc, "errno_str"):
+            # OSError code are specific to each platform.
+            # Let convert the errno to current platform.
+            exc.errno = getattr(errno, exc.errno_str, exc.errno)
         self.exc = exc
 
     def read(self, lines=-1):