itimplement a module to hold global states - 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 a65bc1a1278ab494eabcfeaa57d7ae7d9b49cd84	/git/amprolla/commit/a65bc1a1278ab494eabcfeaa57d7ae7d9b49cd84.gph	parazyd.org	70
1parent ae99aa1f36da29f6b0388e540e227a19e3363ea3	/git/amprolla/commit/ae99aa1f36da29f6b0388e540e227a19e3363ea3.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Fri,  7 Jul 2017 00:35:59 +0200	Err	parazyd.org	70
i	Err	parazyd.org	70
iimplement a module to hold global states	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M amprolla_merge.py                   |       2 ++	Err	parazyd.org	70
i  M amprolla_update.py                  |       2 ++	Err	parazyd.org	70
i  A lib/globalvars.py                   |       8 ++++++++	Err	parazyd.org	70
i  M lib/package.py                      |       8 +++++---	Err	parazyd.org	70
i	Err	parazyd.org	70
i4 files changed, 17 insertions(+), 3 deletions(-)	Err	parazyd.org	70
i---	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@@ -10,6 +10,7 @@ from multiprocessing import Pool	Err	parazyd.org	70
i from time import time	Err	parazyd.org	70
i 	Err	parazyd.org	70
i 	Err	parazyd.org	70
i+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
it@@ -145,6 +146,7 @@ def main_merge(packages_file):	Err	parazyd.org	70
i     to_merge = prepare_merge_dict()	Err	parazyd.org	70
i 	Err	parazyd.org	70
i     for suite in to_merge:	Err	parazyd.org	70
i+        globalvars.suite = suite	Err	parazyd.org	70
i         pkg_list = []	Err	parazyd.org	70
i         for rep in to_merge[suite]:	Err	parazyd.org	70
i             if rep:	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@@ -10,6 +10,7 @@ from multiprocessing import Pool	Err	parazyd.org	70
i 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.log import info	Err	parazyd.org	70
it@@ -40,6 +41,7 @@ def perform_update(suite, paths):	Err	parazyd.org	70
i     """	Err	parazyd.org	70
i     info('Checking for updates in %s' % suite)	Err	parazyd.org	70
i     # print(paths)	Err	parazyd.org	70
i+    globalvars.suite = suite	Err	parazyd.org	70
i 	Err	parazyd.org	70
i     needsmerge = {}	Err	parazyd.org	70
i     needsmerge['downloads'] = []  # all files that have to be downloaded	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@@ -0,0 +1,8 @@	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
i+"""	Err	parazyd.org	70
i+	Err	parazyd.org	70
i+# state for the current suite we're in	Err	parazyd.org	70
i+suite = ""	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@@ -10,6 +10,7 @@ from gzip import open as gzip_open	Err	parazyd.org	70
i from lzma import open as lzma_open	Err	parazyd.org	70
i from shutil import copyfile	Err	parazyd.org	70
i 	Err	parazyd.org	70
i+import lib.globalvars as globalvars	Err	parazyd.org	70
i from lib.config import mergedir, packages_keys, sources_keys, spooldir, logdir	Err	parazyd.org	70
i from lib.log import logtofile	Err	parazyd.org	70
i from lib.parse import parse_dependencies, parse_packages	Err	parazyd.org	70
it@@ -127,9 +128,10 @@ def merge_packages(pkg1, pkg2, name1, name2, banned_packages=set(),	Err	parazyd.org	70
i             new_pkgs[pkg] = pkg1_pkg	Err	parazyd.org	70
i             if package_newer(pkg1_pkg, pkg2_pkg):	Err	parazyd.org	70
i                 logtofile('oldpackages.txt',	Err	parazyd.org	70
i-                          '%s,%s,%s\n' % (pkg1_pkg.get('Package'),	Err	parazyd.org	70
i-                                          pkg1_pkg.get('Version'),	Err	parazyd.org	70
i-                                          pkg2_pkg.get('Version')))	Err	parazyd.org	70
i+                          '%s,%s,%s,%s\n' % (globalvars.suite,	Err	parazyd.org	70
i+                                             pkg1_pkg.get('Package'),	Err	parazyd.org	70
i+                                             pkg1_pkg.get('Version'),	Err	parazyd.org	70
i+                                             pkg2_pkg.get('Version')))	Err	parazyd.org	70
i         elif pkg1_pkg:	Err	parazyd.org	70
i             if not package_banned(pkg1_pkg, banned_packages):	Err	parazyd.org	70
i                 if rewriter:	Err	parazyd.org	70
.