duplicity 3.0.7.dev0__tar.gz → 3.0.8.dev3__tar.gz

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/CHANGELOG.md

@@ -1,10 +1,28 @@
 
-(Unreleased) / 2025-11-26
+(Unreleased) / 2025-12-31
 =========================
 
- * 29e319fa:chg: Add missing ':' between tags and subject.
- * 41e08e43:chg: Use chg|fix|new, not target part.
- * 3418970f:chg: Use `git changelog` instead of `gitchangelog`.
+
+
+rel.3.0.7 / 2025-12-31
+======================
+
+ * ad175c22:fix: replace custom deltree with built-in shutil.rmtree.
+ * 101be7fd:fix: delete duplicate code in DirDelta.
+ * c0d3e72d:fix: webdavs with "--concurrency 1" failed because of missing auth header
+ * a08f8bef:fix: disable s3 checksum workaround, warn only...
+ * f7055a7a:fix: --log-timestamp no longer working.
+ * ac163d5e:fix: Combined fix to related issues 912 and 914
+
+rel.3.0.6.3 / 2025-12-05
+========================
+
+ * dd45a92d:chg: Update check_tags to use current branch.
+ * 5bbb5813:fix: Change log level from Info to Notice in get_passphrase().
+ * a9c4fbad:chg: Add key_needs_passphrase(key).
+ * abaf8485:chg: Better error message from get_remote_file().
+ * b083fca8:fix: 'duplicity --no-check-remote inc' prints spurious warning "found missing difftar(s) in backup sets"
+ * 9400fc37:chg: Add check_tags minor fix to setversion.
  * 29227571:fix: delete unused diffdir.DirSig, diffdir.SigTarBlockIter, librsync.SigFile.
  * 29205145:fix: Delete unused IndexedTuple.
  * b0653566:fix: Delete unused Patch, patch_diff_tarfile, PathPatcher.
@@ -444,6 +462,10 @@ rel.2.0.1 / 2023-08-08
  * fc8da777:fix: Restore pre-parser. Fixes #727.
  * 295e641b:fix: Add missing import to cli_util.py. Fixes #730.
  * 97fd0957:fix: Add missing import to b2backend.py. Fixes #729.
+
+rel.2.0.0 / 2023-08-07
+======================
+
  * 5cb97560:fix: Adjust version to build under LP.
  * 598352ba:fix: Adjust to build under LP Mantic.
 

{duplicity-3.0.7.dev0/duplicity.egg-info → duplicity-3.0.8.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: duplicity
-Version: 3.0.7.dev0
+Version: 3.0.8.dev3
 Summary: Encrypted backup using rsync algorithm
 Author-email: Kenneth Loafman <kenneth@loafman.com>
 Maintainer: Edgar Soldin, Thomas Laubrock

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/__init__.py

@@ -21,7 +21,7 @@
 
 import gettext
 
-__version__: str = "3.0.7.dev0"
-__reldate__: str = "November 20, 2025"
+__version__: str = "3.0.8.dev3"
+__reldate__: str = "January 14, 2026"
 
 gettext.install("duplicity", names=["ngettext"])

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/backends/s3_boto3_backend.py

@@ -74,19 +74,6 @@ class S3Boto3Backend(duplicity.backend.Backend):
         from boto3.s3.transfer import S3UploadFailedError, TransferConfig
         from botocore.exceptions import ClientError
 
-        if not (boto3.__version__ < "1.36.0" and botocore.__version__ < "1.36.0"):
-            # TODO: remove this workaround when issue #870 is fixed.
-            # https://github.com/boto/boto3/issues/2913
-            log.Warn(
-                "WARNING: Using boto3 >= 1,36.0 may result in errors, so we qre applying\n"
-                "the workaround for https://gitlab.com/duplicity/duplicity/-/issues/870\n"
-                "    export AWS_REQUEST_CHECKSUM_CALCULATION=when_required\n"
-                "    export AWS_RESPONSE_CHECKSUM_VALIDATION=when_required\n"
-                "NOTE: This workaround is temporary and will be removed when issue is fixed.\n."
-            )
-            os.environ["AWS_REQUEST_CHECKSUM_CALCULATION"] = "when_required"
-            os.environ["AWS_RESPONSE_CHECKSUM_VALIDATION"] = "when_required"
-
         duplicity.backend.Backend.__init__(self, parsed_url)
 
         # This folds the null prefix and all null parts, which means that:
@@ -109,6 +96,25 @@ class S3Boto3Backend(duplicity.backend.Backend):
         self.bucket = None
         self.tracker = UploadProgressTracker()
 
+        if not (boto3.__version__ < "1.36.0" and botocore.__version__ < "1.36.0"):
+            # this is an issue with 3rd party s3 implementations only
+            # likely when an endpoint is given that resides not under amazonaws.com
+            # in time that workaround will probably not be needed anymore
+            # https://github.com/boto/boto3/issues/2913
+            import re
+
+            if config.s3_endpoint_url and not re.match(
+                pattern="(?i).*\\.amazonaws\\.com(/+)?$", string=config.s3_endpoint_url
+            ):
+                log.Warn(
+                    "WARNING: Using boto3 >= 1,36.0 with non-amazon s3 services"
+                    " may result in checksum errors."
+                    " a workaround is to set the following env vars\n\n"
+                    "    export AWS_REQUEST_CHECKSUM_CALCULATION=when_required\n"
+                    "    export AWS_RESPONSE_CHECKSUM_VALIDATION=when_required\n\n"
+                    "see https://gitlab.com/duplicity/duplicity/-/issues/870 for details."
+                )
+
     def reset_connection(self):
         self.bucket = None
         self.s3 = boto3.resource(

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/backends/webdavbackend.py

@@ -194,9 +194,10 @@ class WebDAVBackend(duplicity.backend.Backend):
         if self.username or self.password:
             # Workaround cpython http.client issue
             # https://github.com/python/cpython/issues/70107
-            self.conn.request("OPTIONS", self.directory, None)
-            response = self.conn.getresponse()
-            response.read()
+            # PUT may not return 401 when ran without basic-auth but throw SSL-EOF-Error or hang
+            # as a workaround we run an OPTIONS request that adds auth if needed and creates
+            # an authenticated connection to (re)use
+            response = self.request("OPTIONS", self.directory, None)
             response.close()
 
     def _close(self):
@@ -226,6 +227,8 @@ class WebDAVBackend(duplicity.backend.Backend):
 
         if self.digest_challenge is not None:
             self.headers["Authorization"] = self.get_digest_authorization(path)
+        elif self.username or self.password:
+            self.headers["Authorization"] = self.get_basic_authorization()
 
         log.Debug(_("WebDAV %s %s request with headers: %s ") % (method, quoted_path, munge_headers(self.headers)))
         log.Debug(_("WebDAV data length: %s ") % sys.getsizeof(data))
@@ -245,6 +248,7 @@ class WebDAVBackend(duplicity.backend.Backend):
                 return self.request(method, self.directory, data, redirected + 1)
             else:
                 raise FatalBackendException(_("WebDAV missing location header in redirect response."))
+        # mainly for digest-auth to recalculate with response values
         elif response.status == 401:
             response.read()
             response.close()

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/cli_data.py

@@ -446,9 +446,9 @@ OptionKwargs = dict(
         type=set_log_file,
         help="Logging filename to use",
     ),
-    # log_timestamp is directly applied in SetLogTimestampAction(), not saved in config
+    # log_timestamp is directly applied in set_log_timestamp(), not saved in config
     log_timestamp=dict(
-        dest="",
+        nargs=0,
         action=SetLogTimestampAction,
         help="Whether to include timestamp and level in log",
         default=dflt(False),

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/cli_util.py

@@ -160,7 +160,7 @@ class SetLogTimestampAction(argparse._StoreConstAction):
         super().__init__(option_strings, dest, **kwargs)
 
     def __call__(self, parser, namespace, values, option_string=None):
-        log._log_timestamp = True
+        log.add_timestamp()
 
 
 def _check_int(val):

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/diffdir.py

@@ -37,7 +37,7 @@ from duplicity import dup_tarfile
 from duplicity import util
 from duplicity.path import *  # pylint: disable=unused-wildcard-import,redefined-builtin
 
-# A StatsObj will be written to this from DirDelta and DirDelta_WriteSig.
+# A StatsObj will be written to this from DirDelta_WriteSig.
 stats = None
 tracker = None
 
@@ -55,7 +55,7 @@ def DirFull(path_iter):
     will be easy to split up the tar and make the volumes the same
     sizes).
     """
-    return DirDelta(path_iter, io.StringIO(""))
+    return DirDelta_WriteSig(path_iter, io.StringIO(""), None)
 
 
 def DirFull_WriteSig(path_iter, sig_outfp):
@@ -65,26 +65,6 @@ def DirFull_WriteSig(path_iter, sig_outfp):
     return DirDelta_WriteSig(path_iter, io.StringIO(""), sig_outfp)
 
 
-def DirDelta(path_iter, dirsig_fileobj_list):
-    """
-    Produce tarblock diff given dirsig_fileobj_list and pathiter
-
-    dirsig_fileobj_list should either be a tar fileobj or a list of
-    those, sorted so the most recent is last.
-    """
-    global stats
-    stats = statistics.StatsDeltaProcess()
-    if isinstance(dirsig_fileobj_list, list):
-        sig_iter = combine_path_iters([sigtar2path_iter(x) for x in dirsig_fileobj_list])
-    else:
-        sig_iter = sigtar2path_iter(dirsig_fileobj_list)
-    delta_iter = get_delta_iter(path_iter, sig_iter)
-    if config.dry_run or (config.progress and not progress.tracker.has_collected_evidence()):
-        return DummyBlockIter(delta_iter)
-    else:
-        return DeltaTarBlockIter(delta_iter)
-
-
 def delta_iter_error_handler(exc, new_path, sig_path, sig_tar=None):  # pylint: disable=unused-argument
     """
     Called by get_delta_iter, report error in getting delta

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/dup_main.py

@@ -132,39 +132,47 @@ def get_passphrase(n, action, for_signing=False):
         log.Notice(_("Reuse configured SIGN_PASSPHRASE as PASSPHRASE"))
         return os.environ["SIGN_PASSPHRASE"]
 
-    # Not in the environment, check if encryption passphrase is needed
-    asymmetric = False
-    need_passphrase = False
-    profile = config.gpg_profile
-    encrypt_keys = profile.recipients + profile.hidden_recipients
-    if profile.sign_key:
-        encrypt_keys.append(profile.sign_key)
-    if encrypt_keys:
-        asymmetric = True
-        for key in encrypt_keys:
-            if util.key_needs_passphrase(key):
-                log.Notice(f"Key {key} needs passphrase.")
-                need_passphrase = True
-                break
-        else:
-            log.Notice("No encryption keys need passphrase.")
-    else:
-        symmetric = True
-        need_passphrase = True
-        log.Notice("No encryption keys configured.")
-
-    skips = copy.copy(skips_sync_archive)
-    skips.remove("full")
-    if (action == "full" and asymmetric) or config.restart or action in skips:
-        log.Notice(f"Skipping passphrase request for action {action}")
+    # Next, verify we need to ask the user
+
+    # Assumptions:
+    #   - encrypt-key has no passphrase
+    #   - sign-key requires passphrase
+    #   - gpg-agent supplies all, no user interaction
+
+    # no passphrase if --no-encryption or --use-agent
+    if not config.encryption or config.use_agent:
         return ""
 
-    elif asymmetric and not need_passphrase:
-        log.Notice(_("Skipping because no encryption key passphrase is needed."))
+    # these commands don't need a password
+    elif action in [
+        "collection-status",
+        "list-current-files",
+        "remove-all-but-n-full",
+        "remove-all-inc-of-but-n-full",
+        "remove-older-than",
+    ]:
+        return ""
+
+    # for a full, inc, verify, we don't need a password if
+    # there is no sign_key and there are recipients
+    elif (
+        action in ("full", "inc", "verify")
+        and (config.gpg_profile.recipients or config.gpg_profile.hidden_recipients)
+        and (not config.gpg_profile.sign_key or (not config.restart and not for_signing))
+    ):
+        return ""
+
+    elif (
+        (config.gpg_profile.recipients or config.gpg_profile.hidden_recipients)
+        and config.metadata_sync_mode == "partial"
+        and action in ["full"]
+    ):
+        log.Info(_("Skipping passphrase input for full backup with encryption keys."))
         return ""
 
+    # Finally, ask the user for the passphrase
     else:
-        log.Notice(_("No environment variables are set, asking user."))
+        log.Info(_("PASSPHRASE variable not set, asking user."))
         use_cache = True
         while True:
             # ask the user to enter a new passphrase to avoid an infinite loop
@@ -758,7 +766,7 @@ def incremental_backup(sig_chain, col_stats=None):
     if config.progress:
         progress.tracker = progress.ProgressTracker()
         # Fake a backup to compute total of moving bytes
-        tarblock_iter = diffdir.DirDelta(config.select, sig_chain.get_fileobjs())
+        tarblock_iter = diffdir.DirDelta_WriteSig(config.select, sig_chain.get_fileobjs(), None)
         dummy_backup(tarblock_iter)
         # Store computed stats to compute progress later
         progress.tracker.set_evidence(diffdir.stats, False)
@@ -768,7 +776,7 @@ def incremental_backup(sig_chain, col_stats=None):
         progress.progress_thread = progress.LogProgressThread()
 
     if config.dry_run:
-        tarblock_iter = diffdir.DirDelta(config.select, sig_chain.get_fileobjs())
+        tarblock_iter = diffdir.DirDelta_WriteSig(config.select, sig_chain.get_fileobjs(), None)
         bytes_written = dummy_backup(tarblock_iter)
     else:
         new_sig_outfp = get_sig_fileobj("new-sig")

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/log.py

@@ -40,7 +40,6 @@ MAX = 9
 PREFIX = ""
 
 _logger = None
-_log_timestamp = False
 
 
 def DupToLoggerLevel(verb):
@@ -321,7 +320,6 @@ def setup():
     Initialize logging
     """
     global _logger
-    global _log_timestamp
     if _logger:
         return
 
@@ -333,18 +331,12 @@ def setup():
 
     # stdout and stderr are for different logging levels
     outHandler = logging.StreamHandler(sys.stdout)
-    if _log_timestamp:
-        outHandler.setFormatter(DetailFormatter())
-    else:
-        outHandler.setFormatter(PrettyProgressFormatter())
+    outHandler.setFormatter(PrettyProgressFormatter())
     outHandler.addFilter(OutFilter())
     _logger.addHandler(outHandler)
 
     errHandler = logging.StreamHandler(sys.stderr)
-    if _log_timestamp:
-        errHandler.setFormatter(DetailFormatter())
-    else:
-        errHandler.setFormatter(PrettyProgressFormatter())
+    errHandler.setFormatter(PrettyProgressFormatter())
     errHandler.addFilter(ErrFilter())
     _logger.addHandler(errHandler)
 
@@ -388,7 +380,7 @@ class DetailFormatter(logging.Formatter):
         # standard 'levelname'.  This is because the standard 'levelname' can
         # be adjusted by any library anywhere in our stack without us knowing.
         # But we control 'levelName'.
-        logging.Formatter.__init__(self, "%(asctime)s %(levelName)s %(message)s")
+        logging.Formatter.__init__(self, "%(asctime)s %(levelName)-6s %(message)s")
 
     def format(self, record):
         s = logging.Formatter.format(self, record)
@@ -452,6 +444,28 @@ def add_file(filename):
     _logger.addHandler(handler)
 
 
+def add_timestamp():
+    """
+    Add timestamp to logs written
+    """
+    global _logger
+
+    # remove all handlers
+    for handler in _logger.handlers[:]:
+        _logger.removeHandler(handler)
+
+    # stdout and stderr are for different logging levels
+    outHandler = logging.StreamHandler(sys.stdout)
+    outHandler.setFormatter(DetailFormatter())
+    outHandler.addFilter(OutFilter())
+    _logger.addHandler(outHandler)
+
+    errHandler = logging.StreamHandler(sys.stderr)
+    errHandler.setFormatter(DetailFormatter())
+    errHandler.addFilter(ErrFilter())
+    _logger.addHandler(errHandler)
+
+
 def setverbosity(verb):
     """
     Set the verbosity level.

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/path.py

@@ -623,13 +623,8 @@ class Path(ROPath):
 
     def deltree(self):
         """Remove self by recursively deleting files under it"""
-        from duplicity import selection  # TODO: avoid circ. dep. issue
-
         log.Debug(_("Deleting tree %s") % self.uc_name)
-        itr = IterTreeReducer(PathDeleter, [])
-        for path in selection.Select(self).set_iter():
-            itr(path.index, path)
-        itr.Finish()
+        shutil.rmtree(self.name)
         self.setdata()
 
     def get_parent_dir(self):
@@ -807,19 +802,3 @@ class DupPath(Path):
                 return gpg.GPGFile(True, self, gpg_profile)
         else:
             return self.open(mode)
-
-
-class PathDeleter(ITRBranch):
-    """Delete a directory.  Called by Path.deltree"""
-
-    def start_process(self, index, path):  # pylint: disable=unused-argument
-        self.path = path
-
-    def end_process(self):
-        self.path.delete()
-
-    def can_fast_process(self, index, path):  # pylint: disable=unused-argument
-        return not path.isdir()
-
-    def fast_process(self, index, path):  # pylint: disable=unused-argument
-        path.delete()

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/duplicity/util.py

@@ -27,11 +27,13 @@ import atexit
 import csv
 import errno
 import json
+import locale
 import multiprocessing
 import os
 import socket
 import sys
 import traceback
+from contextlib import contextmanager
 from io import StringIO
 
 import fasteners
@@ -203,30 +205,6 @@ def release_lockfile():
             pass
 
 
-def key_needs_passphrase(key):
-    """
-    Check if a key needs a passphrase.
-    """
-    try:
-        child = pexpect.spawn("gpg", f"--pinentry-mode=loopback --dry-run --passwd {key}".split())
-    except Exception:
-        log.FatalError(f"Exception spawning gpg while checking if passphrase needed for key: {key}")
-
-    try:
-        got = child.expect(["passphrase.*:", pexpect.EOF])
-    except Exception:
-        log.FatalError(f"Exception while checking if passphrase needed for key: {key}: {str(child)}")
-
-    if got == 0:
-        log.Debug(f"Key {key} needs passphrase")
-        child.close()
-        return True
-    elif got == 1:
-        log.Debug(f"Key {key} does not need passphrase")
-        return False
-    return None
-
-
 def copyfileobj(infp, outfp, byte_count=-1):
     """
     Copy byte_count bytes from infp to outfp, or all if byte_count < 0

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3/duplicity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: duplicity
-Version: 3.0.7.dev0
+Version: 3.0.8.dev3
 Summary: Encrypted backup using rsync algorithm
 Author-email: Kenneth Loafman <kenneth@loafman.com>
 Maintainer: Edgar Soldin, Thomas Laubrock

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/man/duplicity.1

@@ -1,4 +1,4 @@
-.TH DUPLICITY 1 "November 20, 2025" "Version 3.0.7.dev0" "User Manuals" \"  -*- nroff -*-
+.TH DUPLICITY 1 "January 14, 2026" "Version 3.0.8.dev3" "User Manuals" \"  -*- nroff -*-
 .\" disable justification (adjust text to left margin only)
 .\" command line examples stay readable through that
 .ad l
@@ -497,23 +497,6 @@ See the
 .B FILE SELECTION
 section for more information.
 
-.TP
-.BI "--files-from " filename
-Read a list of files to backup from filename rather than searching the entire
-backup source directory. Operation is otherwise normal, just on the specified
-subset of the backup source directory.
-
-Files must be specified one per line and relative to the backup source
-directory. Any absolute paths will raise an error. All characters per line are
-significant and treated as part of the path, including leading and trailing
-whitespace. Lines are separated by newlines or nulls, depending on whether the
-.B "--null-separator"
-switch was given.
-
-It is not necessary to include the parent directory of listed files, their
-inclusion is implied. However, the content of any explicitly listed directories
-is not implied. All required files must be listed when this option is used.
-
 .TP
 .BI "--file-prefix " prefix
 .PD 0
@@ -535,12 +518,21 @@ See also
 .B "A NOTE ON FILENAME PREFIXES"
 
 .TP
-.BI "--path-to-restore " path
-This option may be given in restore mode, causing only
-.I path
-to be restored instead of the entire contents of the backup archive.
-.I path
-should be given relative to the root of the directory backed up.
+.BI "--files-from " filename
+Read a list of files to backup from filename rather than searching the entire
+backup source directory. Operation is otherwise normal, just on the specified
+subset of the backup source directory.
+
+Files must be specified one per line and relative to the backup source
+directory. Any absolute paths will raise an error. All characters per line are
+significant and treated as part of the path, including leading and trailing
+whitespace. Lines are separated by newlines or nulls, depending on whether the
+.B "--null-separator"
+switch was given.
+
+It is not necessary to include the parent directory of listed files, their
+inclusion is implied. However, the content of any explicitly listed directories
+is not implied. All required files must be listed when this option is used.
 
 .TP
 .BI --filter-globbing
@@ -572,15 +564,6 @@ See the
 .B FILE SELECTION
 section for more information.
 
-.TP
-.BI "--full-if-older-than " time
-Perform a full backup if an incremental backup is requested, but the
-latest full backup in the collection is older than the given
-.IR time .
-See the
-.B TIME FORMATS
-section for more information.
-
 .TP
 .BI --force
 Proceed even if data loss might result.  Duplicity will let the user
@@ -596,6 +579,15 @@ out.
 .BI --ftp-regular
 Use regular (PORT) data connections.
 
+.TP
+.BI "--full-if-older-than " time
+Perform a full backup if an incremental backup is requested, but the
+latest full backup in the collection is older than the given
+.IR time .
+See the
+.B TIME FORMATS
+section for more information.
+
 .TP
 .BI --gio
 Use the GIO backend and interpret any URLs as GIO would.
@@ -862,6 +854,14 @@ for Par2 recovery files (default 10%).
 .BI "--par2-volumes " number
 Number of Par2 volumes to create (default 1).
 
+.TP
+.BI "--path-to-restore " path
+This option may be given in restore mode, causing only
+.I path
+to be restored instead of the entire contents of the backup archive.
+.I path
+should be given relative to the root of the directory backed up.
+
 .TP
 .BI --progress
 When selected, duplicity will output the current upload progress and estimated

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "duplicity"
-version = "3.0.7.dev0"
+version = "3.0.8.dev3"
 dynamic = ["dependencies"]
 description = "Encrypted backup using rsync algorithm"
 authors = [
@@ -126,9 +126,6 @@ addopts = [
     "-p no:randomly",
     "-p no:xdist",
 ]
-markers = [
-    "slow: test runs >= 10 secs",
-]
 testpaths = [
     "testing/test_code.py",
     "testing/unit",

{duplicity-3.0.7.dev0 → duplicity-3.0.8.dev3}/setup.py

@@ -42,7 +42,7 @@ elif not ((3, 9) <= sys.version_info[:2] <= (3, 14)):
     print("Sorry, duplicity requires version 3.9 thru 3.14 of Python.", file=sys.stderr)
     sys.exit(1)
 
-Version: str = "3.0.7.dev0"
+Version: str = "3.0.8.dev3"
 
 # READTHEDOCS uses setup.py sdist but can't handle extensions
 ext_modules = list()