forks/archivebox
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into v0.5.0

Browse source
This commit is contained in:
Nick Sweeting 2020-12-05 17:45:16 -05:00 • committed by GitHub
commit 7bc13204e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/docker.yml vendored
View file

@ -1,8 +1,12 @@
name: Docker name: Docker
on: on:
workflow_dispatch:
push: push:
branches:
- master
release:
types:
- created
env: env:
DOCKER_IMAGE: archivebox-ci DOCKER_IMAGE: archivebox-ci

2
archivebox/index/__init__.py
View file

@ -233,7 +233,7 @@ def write_main_index(links: List[Link], out_dir: Path=OUTPUT_DIR) -> None:
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
stderr('[!] Warning: Still writing index to disk...', color='lightyellow') stderr('[!] Warning: Still writing index to disk...', color='lightyellow')
stderr(' Run archivebox init to fix any inconsisntencies from an ungraceful exit.') stderr(' Run archivebox init to fix any inconsistencies from an ungraceful exit.')
with timed_index_update(out_dir / SQL_INDEX_FILENAME): with timed_index_update(out_dir / SQL_INDEX_FILENAME):
write_sql_main_index(links, out_dir=out_dir) write_sql_main_index(links, out_dir=out_dir)
os.chmod(out_dir / SQL_INDEX_FILENAME, int(OUTPUT_PERMISSIONS, base=8)) # set here because we don't write it with atomic writes os.chmod(out_dir / SQL_INDEX_FILENAME, int(OUTPUT_PERMISSIONS, base=8)) # set here because we don't write it with atomic writes