Browse Source

comment cleanup

keep-around/e977c9e07f177e8bc2b51265de1bc93475397f61
parazyd 6 years ago
parent
commit
7cf5d7bcfc
Signed by untrusted user: parazyd GPG Key ID: F0CB28FCF78637DE
  1. 2
      amprolla_init.py
  2. 2
      amprolla_merge.py
  3. 2
      amprolla_merge_contents.py
  4. 6
      contrib/populate_aliases.sh
  5. 2
      lib/config.def.py
  6. 2
      lib/globalvars.py
  7. 2
      lib/log.py
  8. 2
      lib/net.py
  9. 5
      lib/package.py
  10. 10
      lib/parse.py
  11. 2
      lib/release.py
  12. 10
      orchestrate.sh

2
amprolla_init.py

@ -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

2
amprolla_merge.py

@ -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

2
amprolla_merge_contents.py

@ -1,4 +1,6 @@
#!/usr/bin/env python3
# See LICENSE file for copyright and license details.
"""
Amprolla module for merging Contents files
"""

6
contrib/populate_aliases.sh

@ -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"

2
lib/config.def.py

@ -1,4 +1,4 @@
# see LICENSE file for copyright and license details
# See LICENSE file for copyright and license details.
"""
amprolla configuration file

2
lib/globalvars.py

@ -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

2
lib/log.py

@ -1,4 +1,4 @@
# see LICENSE file for copyright and license details
# See LICENSE file for copyright and license details.
"""
Logging functions

2
lib/net.py

@ -1,4 +1,4 @@
# see LICENSE file for copyright and license details
# See LICENSE file for copyright and license details.
"""
Network functions/helpers

5
lib/package.py

@ -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
@ -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?

10
lib/parse.py

@ -1,4 +1,4 @@
# see LICENSE file for copyright and license details
# See LICENSE file for copyright and license details.
"""
Parsing functions/helpers
@ -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')
@ -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')

2
lib/release.py

@ -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

10
orchestrate.sh

@ -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

Loading…
Cancel
Save