ituse the locking functions - amprolla - devuan's apt repo merger	Err	parazyd.org	70
hgit clone git://parazyd.org/amprolla.git	URL:git://parazyd.org/amprolla.git	parazyd.org	70
1Log	/git/amprolla/log.gph	parazyd.org	70
1Files	/git/amprolla/files.gph	parazyd.org	70
1Refs	/git/amprolla/refs.gph	parazyd.org	70
1README	/git/amprolla/file/README.md.gph	parazyd.org	70
1LICENSE	/git/amprolla/file/LICENSE.gph	parazyd.org	70
i---	Err	parazyd.org	70
1commit 992d24959e7e85852557df8ad553c711af5a9729	/git/amprolla/commit/992d24959e7e85852557df8ad553c711af5a9729.gph	parazyd.org	70
1parent 32b7d87eeed5748306269f5eb1eaaf55e06bba3c	/git/amprolla/commit/32b7d87eeed5748306269f5eb1eaaf55e06bba3c.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Mon,  6 Nov 2017 13:55:29 +0100	Err	parazyd.org	70
i	Err	parazyd.org	70
iuse the locking functions	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M amprolla_init.py                    |       3 +++	Err	parazyd.org	70
i  M amprolla_merge.py                   |       3 +++	Err	parazyd.org	70
i  M amprolla_merge_contents.py          |       5 ++++-	Err	parazyd.org	70
i  M amprolla_update.py                  |       5 ++++-	Err	parazyd.org	70
i  M orchestrate.sh                      |       2 ++	Err	parazyd.org	70
i	Err	parazyd.org	70
i5 files changed, 16 insertions(+), 2 deletions(-)	Err	parazyd.org	70
i---	Err	parazyd.org	70
1diff --git a/amprolla_init.py b/amprolla_init.py	/git/amprolla/file/amprolla_init.py.gph	parazyd.org	70
it@@ -12,6 +12,7 @@ from time import time	Err	parazyd.org	70
i 	Err	parazyd.org	70
i from lib.config import (aliases, arches, categories, cpunm, mainrepofiles,	Err	parazyd.org	70
i                         repos, spooldir, suites)	Err	parazyd.org	70
i+from lib.lock import check_lock, free_lock	Err	parazyd.org	70
i from lib.net import download	Err	parazyd.org	70
i from lib.parse import parse_release	Err	parazyd.org	70
i 	Err	parazyd.org	70
it@@ -87,6 +88,8 @@ def main():	Err	parazyd.org	70
i 	Err	parazyd.org	70
i if __name__ == '__main__':	Err	parazyd.org	70
i     t1 = time()	Err	parazyd.org	70
i+    check_lock()	Err	parazyd.org	70
i     main()	Err	parazyd.org	70
i+    free_lock()	Err	parazyd.org	70
i     t2 = time()	Err	parazyd.org	70
i     print('total time: %s' % (t2 - t1))	Err	parazyd.org	70
1diff --git a/amprolla_merge.py b/amprolla_merge.py	/git/amprolla/file/amprolla_merge.py.gph	parazyd.org	70
it@@ -14,6 +14,7 @@ import lib.globalvars as globalvars	Err	parazyd.org	70
i from lib.config import (aliases, arches, banpkgs, categories, cpunm, mergedir,	Err	parazyd.org	70
i                         mergesubdir, pkgfiles, repos, repo_order, signrelease,	Err	parazyd.org	70
i                         spooldir, srcfiles, suites)	Err	parazyd.org	70
i+from lib.lock import check_lock, free_lock	Err	parazyd.org	70
i from lib.package import (load_packages_file, merge_packages_many,	Err	parazyd.org	70
i                          write_packages)	Err	parazyd.org	70
i from lib.release import write_release	Err	parazyd.org	70
it@@ -195,6 +196,8 @@ def main():	Err	parazyd.org	70
i 	Err	parazyd.org	70
i if __name__ == '__main__':	Err	parazyd.org	70
i     t1 = time()	Err	parazyd.org	70
i+    check_lock()	Err	parazyd.org	70
i     main()	Err	parazyd.org	70
i+    free_lock()	Err	parazyd.org	70
i     t2 = time()	Err	parazyd.org	70
i     print('total time: %s' % (t2 - t1))	Err	parazyd.org	70
1diff --git a/amprolla_merge_contents.py b/amprolla_merge_contents.py	/git/amprolla/file/amprolla_merge_contents.py.gph	parazyd.org	70
it@@ -11,10 +11,11 @@ from os import makedirs	Err	parazyd.org	70
i from os.path import dirname, join, isfile	Err	parazyd.org	70
i from time import time	Err	parazyd.org	70
i 	Err	parazyd.org	70
i+import lib.globalvars as globalvars	Err	parazyd.org	70
i from amprolla_merge import prepare_merge_dict	Err	parazyd.org	70
i from lib.config import (arches, categories, cpunm, mergedir, mergesubdir,	Err	parazyd.org	70
i                         repos, spooldir)	Err	parazyd.org	70
i-import lib.globalvars as globalvars	Err	parazyd.org	70
i+from lib.lock import check_lock, free_lock	Err	parazyd.org	70
i 	Err	parazyd.org	70
i 	Err	parazyd.org	70
i def merge_contents(filelist):	Err	parazyd.org	70
it@@ -105,6 +106,8 @@ def main():	Err	parazyd.org	70
i 	Err	parazyd.org	70
i if __name__ == '__main__':	Err	parazyd.org	70
i     t1 = time()	Err	parazyd.org	70
i+    check_lock()	Err	parazyd.org	70
i     main()	Err	parazyd.org	70
i+    free_lock()	Err	parazyd.org	70
i     t2 = time()	Err	parazyd.org	70
i     print('total time: %s' % (t2 - t1))	Err	parazyd.org	70
1diff --git a/amprolla_update.py b/amprolla_update.py	/git/amprolla/file/amprolla_update.py.gph	parazyd.org	70
it@@ -11,11 +11,12 @@ from time import time	Err	parazyd.org	70
i import requests	Err	parazyd.org	70
i 	Err	parazyd.org	70
i import lib.globalvars as globalvars	Err	parazyd.org	70
i+from amprolla_merge import gen_release, merge, prepare_merge_dict	Err	parazyd.org	70
i from lib.config import aliases, cpunm, repos, repo_order, spooldir	Err	parazyd.org	70
i+from lib.lock import check_lock, free_lock	Err	parazyd.org	70
i from lib.log import info, warn	Err	parazyd.org	70
i from lib.parse import compare_dict, get_date, get_time, parse_release	Err	parazyd.org	70
i from lib.net import download	Err	parazyd.org	70
i-from amprolla_merge import gen_release, merge, prepare_merge_dict	Err	parazyd.org	70
i 	Err	parazyd.org	70
i 	Err	parazyd.org	70
i def remote_is_newer(remote, local):	Err	parazyd.org	70
it@@ -142,6 +143,8 @@ def main():	Err	parazyd.org	70
i 	Err	parazyd.org	70
i if __name__ == '__main__':	Err	parazyd.org	70
i     t1 = time()	Err	parazyd.org	70
i+    check_lock()	Err	parazyd.org	70
i     main()	Err	parazyd.org	70
i+    free_lock()	Err	parazyd.org	70
i     t2 = time()	Err	parazyd.org	70
i     print('total time: %s' % (t2 - t1))	Err	parazyd.org	70
1diff --git a/orchestrate.sh b/orchestrate.sh	/git/amprolla/file/orchestrate.sh.gph	parazyd.org	70
it@@ -10,6 +10,7 @@ REPO_ROOT="${REPO_ROOT:-/srv/amprolla}"	Err	parazyd.org	70
i # TODO: Remove the while loop and run with cron after testing phase	Err	parazyd.org	70
i 	Err	parazyd.org	70
i while true; do	Err	parazyd.org	70
i+        [ -f "/tmp/amprolla.lock" ] || {	Err	parazyd.org	70
i         ln -snf "$REPO_ROOT"/merged-staging "$REPO_ROOT"/merged	Err	parazyd.org	70
i         # The break call is temporary to catch unhandled exceptions in the testing phase	Err	parazyd.org	70
i         python3 "$AMPROLLA_UPDATE" || {	Err	parazyd.org	70
it@@ -29,6 +30,7 @@ while true; do	Err	parazyd.org	70
i 	Err	parazyd.org	70
i         # handle obsolete package logs	Err	parazyd.org	70
i         cat "$REPO_ROOT"/log/*-oldpackages.txt | sort | uniq > "$REPO_ROOT"/log/oldpackages.txt	Err	parazyd.org	70
i+        }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i         sleep 3600	Err	parazyd.org	70
i done	Err	parazyd.org	70
.