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