Skip to content

Commit

Permalink
rollup
Browse files Browse the repository at this point in the history
  • Loading branch information
Ken Kundert authored and Ken Kundert committed Aug 5, 2024
1 parent bc36b6b commit 213ed32
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/accessories.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
]

Expand Down
3 changes: 2 additions & 1 deletion emborg/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions emborg/emborg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion emborg/overdue.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 213ed32

Please sign in to comment.