amprolla

commit 31fead1c38661cfa9425aec47549407fe3715f40
parent 2abe27f3463956df14e070788a1a078eeeec03e5
Author: parazyd <parazyd@dyne.org>
Date:   Wed,  6 Dec 2017 17:40:30 +0100

move the "skips" list into config.py

Diffstat:
M
amprolla_init.py
 | 
3
+--
M
amprolla_merge.py
 | 
3
+--
M
amprolla_update.py
 | 
3
+--
M
lib/config.def.py
 | 
3
+++

4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/amprolla_init.py b/amprolla_init.py
@@ -11,7 +11,7 @@ from multiprocessing import Pool
 from time import time
 
 from lib.config import (aliases, arches, categories, cpunm, mainrepofiles,
-                        repos, spooldir, suites)
+                        repos, spooldir, suites, skips)
 from lib.lock import check_lock, free_lock
 from lib.net import download
 from lib.parse import parse_release
@@ -41,7 +41,6 @@ def pop_dirs(repo):
                     suite = aliases[repodata['name']][j]
                 elif repodata['skipmissing'] is True:
                     continue
-                skips = ['jessie-security', 'ascii-security']  # hack
                 if repo == 'debian' and j in skips:
                     continue
             pair = (join(baseurl, suite),
diff --git a/amprolla_merge.py b/amprolla_merge.py
@@ -13,7 +13,7 @@ from time import time
 import lib.globalvars as globalvars
 from lib.config import (aliases, arches, banpkgs, categories, cpunm, mergedir,
                         mergesubdir, pkgfiles, repos, repo_order, signrelease,
-                        spooldir, srcfiles, suites)
+                        spooldir, srcfiles, suites, skips)
 from lib.lock import check_lock, free_lock
 from lib.package import (load_packages_file, merge_packages_many,
                          write_packages)
@@ -42,7 +42,6 @@ def prepare_merge_dict():
                     tmpsuite = aliases[repos[repo]['name']][suite]
                 elif repos[repo]['skipmissing'] is True:
                     tmpsuite = None
-                skips = ['jessie-security', 'ascii-security']
                 if repo == 'debian' and suite in skips:
                     tmpsuite = None
             if tmpsuite:  # make it a proper path
diff --git a/amprolla_update.py b/amprolla_update.py
@@ -12,7 +12,7 @@ import requests
 
 import lib.globalvars as globalvars
 from amprolla_merge import gen_release, merge, prepare_merge_dict
-from lib.config import aliases, cpunm, repos, repo_order, spooldir
+from lib.config import aliases, cpunm, repos, repo_order, spooldir, skips
 from lib.lock import check_lock, free_lock
 from lib.log import info, warn
 from lib.parse import compare_dict, get_date, get_time, parse_release
@@ -110,7 +110,6 @@ def perform_update(suite, paths):
                     sui = aliases[repos[j]['name']][suite]
                 elif repos[j]['skipmissing']:
                     sui = None
-                skips = ['jessie-security', 'ascii-security']  # hack
                 if j == 'debian' and suite in skips:
                     sui = None
 
diff --git a/lib/config.def.py b/lib/config.def.py
@@ -25,6 +25,9 @@ checksums = [
 distrolabel = 'Devuan'
 repo_order = ['devuan', 'debian-security', 'debian']
 
+# used for a hacky way to skip certain suites when crawling Debian
+skips = ['jessie-security', 'ascii-security']
+
 repos = {
     'devuan': {
         'name': 'DEVUAN',