From 213ed32bd90c0055ca387a51eabe877230940d98 Mon Sep 17 00:00:00 2001
From: Ken Kundert <ken@theKunderts.net>
Date: Mon, 5 Aug 2024 11:12:16 -0700
Subject: [PATCH] rollup

---
 .github/workflows/build.yaml | 4 ++--
 doc/accessories.rst          | 2 +-
 emborg/command.py            | 3 ++-
 emborg/emborg.py             | 3 +++
 emborg/overdue.py            | 2 +-
 pyproject.toml               | 3 +--
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 43cf246..2dd6e9f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -21,10 +21,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Borg
-        run:
+        run: |
           sudo apt install borgbackup
       - name: Install packages
-        run:
+        run: |
           python -m pip install --upgrade pip
           pip install .
           pip install tox
diff --git a/doc/accessories.rst b/doc/accessories.rst
index f62704c..573eba4 100644
--- a/doc/accessories.rst
+++ b/doc/accessories.rst
@@ -62,7 +62,7 @@ composite log file::
             '--entry', 'h:mm A  {{{{{{2',
             '--description', '{cmd_name}',
             '--fold-marker', '{{{{{{ ❬❬❬',
-            '/home/me/.local/share/emborg/{config_name}.log',
+            '{log_dir}/{config_name}.log',
         ],
     ]
 
diff --git a/emborg/command.py b/emborg/command.py
index d95df99..92c496d 100644
--- a/emborg/command.py
+++ b/emborg/command.py
@@ -192,7 +192,8 @@ def get_archive_paths(paths, settings):
                     path = path.relative_to(settings.working_dir)
 
                     resolved_paths.append(path)
-                    paths_not_found.remove(name)
+                    if name in paths_not_found:
+                        paths_not_found.remove(name)
                 except ValueError:
                     pass
         if paths_not_found:
diff --git a/emborg/emborg.py b/emborg/emborg.py
index 4a8ea31..5867e25 100644
--- a/emborg/emborg.py
+++ b/emborg/emborg.py
@@ -979,6 +979,9 @@ def __enter__(self):
     # exit {{{2
     def __exit__(self, exc_type, exc_val, exc_tb):
 
+        # flush stdout
+        print(end='', flush=True)
+
         # delete lockfile
         if self.requires_exclusivity:
             self.lockfile.unlink()
diff --git a/emborg/overdue.py b/emborg/overdue.py
index 0f4c343..de0829b 100644
--- a/emborg/overdue.py
+++ b/emborg/overdue.py
@@ -229,7 +229,7 @@ def send_mail(recipient, subject, message):
                 if overdue or not cmdline["--no-passes"]:
                     replacements = dict(
                         host=host, path=path, mtime=mtime, age=age,
-                        max_age=max_age, overdue=overdue
+                        hours=hours, max_age=max_age, overdue=overdue
                     )
                     try:
                         report(status_message.format(**replacements))
diff --git a/pyproject.toml b/pyproject.toml
index 747ca94..3c99aa5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,8 +23,7 @@ dependencies = [
     "arrow>=0.15",
     # "avendesora",  # optional
     "docopt",
-    # inform>=1.30  # — required for new version of emborg-overdue
-        "inform>=1.29.1",
+    "inform>=1.30",
     "nestedtext",
     "quantiphy",
     "requests",