itcomment cleanup - 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 7cf5d7bcfcdd7760d212226fa7a939903774dcde	/git/amprolla/commit/7cf5d7bcfcdd7760d212226fa7a939903774dcde.gph	parazyd.org	70
1parent e57b27612f2df0ade2d8f4dba62943712d6b74b4	/git/amprolla/commit/e57b27612f2df0ade2d8f4dba62943712d6b74b4.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Mon, 24 Jul 2017 11:37:26 +0200	Err	parazyd.org	70
i	Err	parazyd.org	70
icomment cleanup	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M amprolla_init.py                    |       2 +-	Err	parazyd.org	70
i  M amprolla_merge.py                   |       2 +-	Err	parazyd.org	70
i  M amprolla_merge_contents.py          |       2 ++	Err	parazyd.org	70
i  M contrib/populate_aliases.sh         |       6 ++++--	Err	parazyd.org	70
i  M lib/config.def.py                   |       2 +-	Err	parazyd.org	70
i  M lib/globalvars.py                   |       2 +-	Err	parazyd.org	70
i  M lib/log.py                          |       2 +-	Err	parazyd.org	70
i  M lib/net.py                          |       2 +-	Err	parazyd.org	70
i  M lib/package.py                      |       5 +++--	Err	parazyd.org	70
i  M lib/parse.py                        |      10 +++++++---	Err	parazyd.org	70
i  M lib/release.py                      |       2 +-	Err	parazyd.org	70
i  M orchestrate.sh                      |      10 ++++++----	Err	parazyd.org	70
i	Err	parazyd.org	70
i12 files changed, 29 insertions(+), 18 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@@ -1,5 +1,5 @@	Err	parazyd.org	70
i #!/usr/bin/env python3	Err	parazyd.org	70
i-# see LICENSE file for copyright and license details	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i """	Err	parazyd.org	70
i This module will download the initial Release files used to populate	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@@ -1,5 +1,5 @@	Err	parazyd.org	70
i #!/usr/bin/env python3	Err	parazyd.org	70
i-# see LICENSE file for copyright and license details	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i """	Err	parazyd.org	70
i Amprolla main module	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@@ -1,4 +1,6 @@	Err	parazyd.org	70
i #!/usr/bin/env python3	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i+	Err	parazyd.org	70
i """	Err	parazyd.org	70
i Amprolla module for merging Contents files	Err	parazyd.org	70
i """	Err	parazyd.org	70
1diff --git a/contrib/populate_aliases.sh b/contrib/populate_aliases.sh	/git/amprolla/file/contrib/populate_aliases.sh.gph	parazyd.org	70
it@@ -1,6 +1,8 @@	Err	parazyd.org	70
i #!/bin/sh	Err	parazyd.org	70
i-# helper script to be ran once after the initial mass merge in order	Err	parazyd.org	70
i-# to populate the structure with the needed symlinks	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i+	Err	parazyd.org	70
i+# Helper script to be ran once after the initial mass merge in	Err	parazyd.org	70
i+# order to populate the structure with the needed symlinks.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i dryrun=""	Err	parazyd.org	70
i [ "$1" = "-d" ] && dryrun="echo"	Err	parazyd.org	70
1diff --git a/lib/config.def.py b/lib/config.def.py	/git/amprolla/file/lib/config.def.py.gph	parazyd.org	70
it@@ -1,4 +1,4 @@	Err	parazyd.org	70
i-# see LICENSE file for copyright and license details	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i """	Err	parazyd.org	70
i amprolla configuration file	Err	parazyd.org	70
1diff --git a/lib/globalvars.py b/lib/globalvars.py	/git/amprolla/file/lib/globalvars.py.gph	parazyd.org	70
it@@ -1,4 +1,4 @@	Err	parazyd.org	70
i-# see LICENSE file for copyright and license details	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i """	Err	parazyd.org	70
i amprolla globals to pass around	Err	parazyd.org	70
1diff --git a/lib/log.py b/lib/log.py	/git/amprolla/file/lib/log.py.gph	parazyd.org	70
it@@ -1,4 +1,4 @@	Err	parazyd.org	70
i-# see LICENSE file for copyright and license details	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i """	Err	parazyd.org	70
i Logging functions	Err	parazyd.org	70
1diff --git a/lib/net.py b/lib/net.py	/git/amprolla/file/lib/net.py.gph	parazyd.org	70
it@@ -1,4 +1,4 @@	Err	parazyd.org	70
i-# see LICENSE file for copyright and license details	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i """	Err	parazyd.org	70
i Network functions/helpers	Err	parazyd.org	70
1diff --git a/lib/package.py b/lib/package.py	/git/amprolla/file/lib/package.py.gph	parazyd.org	70
it@@ -1,4 +1,4 @@	Err	parazyd.org	70
i-# see LICENSE file for copyright and license details	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i """	Err	parazyd.org	70
i Package merging functions and helpers	Err	parazyd.org	70
it@@ -62,7 +62,8 @@ def write_packages(packages, filename, sort=True, sources=False):	Err	parazyd.org	70
i 	Err	parazyd.org	70
i 	Err	parazyd.org	70
i def load_packages_file(filename):	Err	parazyd.org	70
i-    """ Load a gzip'd packages file.	Err	parazyd.org	70
i+    """	Err	parazyd.org	70
i+    Load a gzip'd packages file.	Err	parazyd.org	70
i     Returns a dictionary of package name and package key-values.	Err	parazyd.org	70
i     """	Err	parazyd.org	70
i     # TODO: should we skip files like this if they don't exist?	Err	parazyd.org	70
1diff --git a/lib/parse.py b/lib/parse.py	/git/amprolla/file/lib/parse.py.gph	parazyd.org	70
it@@ -1,4 +1,4 @@	Err	parazyd.org	70
i-# see LICENSE file for copyright and license details	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i """	Err	parazyd.org	70
i Parsing functions/helpers	Err	parazyd.org	70
it@@ -49,7 +49,9 @@ def parse_release(reltext):	Err	parazyd.org	70
i 	Err	parazyd.org	70
i 	Err	parazyd.org	70
i def parse_release_head(reltext):	Err	parazyd.org	70
i-    """Parses the header of the release file to grab needed metadata"""	Err	parazyd.org	70
i+    """	Err	parazyd.org	70
i+    Parses the header of the release file to grab needed metadata	Err	parazyd.org	70
i+    """	Err	parazyd.org	70
i     metadata = {}	Err	parazyd.org	70
i 	Err	parazyd.org	70
i     contents = reltext.split('\n')	Err	parazyd.org	70
it@@ -69,7 +71,9 @@ def parse_release_head(reltext):	Err	parazyd.org	70
i 	Err	parazyd.org	70
i 	Err	parazyd.org	70
i def parse_package(entry):	Err	parazyd.org	70
i-    """ Parses a single Packages entry """	Err	parazyd.org	70
i+    """	Err	parazyd.org	70
i+    Parses a single Packages entry	Err	parazyd.org	70
i+    """	Err	parazyd.org	70
i     pkgs = {}	Err	parazyd.org	70
i 	Err	parazyd.org	70
i     contents = entry.split('\n')	Err	parazyd.org	70
1diff --git a/lib/release.py b/lib/release.py	/git/amprolla/file/lib/release.py.gph	parazyd.org	70
it@@ -1,4 +1,4 @@	Err	parazyd.org	70
i-# see LICENSE file for copyright and license details	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i """	Err	parazyd.org	70
i Release file functions and helpers	Err	parazyd.org	70
1diff --git a/orchestrate.sh b/orchestrate.sh	/git/amprolla/file/orchestrate.sh.gph	parazyd.org	70
it@@ -1,15 +1,17 @@	Err	parazyd.org	70
i #!/bin/sh	Err	parazyd.org	70
i-# orchestration of incremental updates	Err	parazyd.org	70
i+# See LICENSE file for copyright and license details.	Err	parazyd.org	70
i 	Err	parazyd.org	70
i-# make sure these correlate to lib/config.py	Err	parazyd.org	70
i+# Orchestration of incremental updates	Err	parazyd.org	70
i+	Err	parazyd.org	70
i+# Make sure these correlate to lib/config.py	Err	parazyd.org	70
i AMPROLLA_UPDATE=/srv/amprolla/amprolla_update.py	Err	parazyd.org	70
i REPO_ROOT=/srv/amprolla	Err	parazyd.org	70
i 	Err	parazyd.org	70
i-# TODO: remove the while loop and run with cron after testing phase	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         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+        # 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
i                 ln -snf "$REPO_ROOT"/merged-production "$REPO_ROOT"/merged	Err	parazyd.org	70
i                 break	Err	parazyd.org	70
.