itmove the "skips" list into config.py - 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 31fead1c38661cfa9425aec47549407fe3715f40 /git/amprolla/commit/31fead1c38661cfa9425aec47549407fe3715f40.gph parazyd.org 70 1parent 2abe27f3463956df14e070788a1a078eeeec03e5 /git/amprolla/commit/2abe27f3463956df14e070788a1a078eeeec03e5.gph parazyd.org 70 hAuthor: parazyd URL:mailto:parazyd@dyne.org parazyd.org 70 iDate: Wed, 6 Dec 2017 17:40:30 +0100 Err parazyd.org 70 i Err parazyd.org 70 imove the "skips" list into config.py Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M amprolla_init.py | 3 +-- Err parazyd.org 70 i M amprolla_merge.py | 3 +-- Err parazyd.org 70 i M amprolla_update.py | 3 +-- Err parazyd.org 70 i M lib/config.def.py | 3 +++ Err parazyd.org 70 i Err parazyd.org 70 i4 files changed, 6 insertions(+), 6 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@@ -11,7 +11,7 @@ from multiprocessing import Pool Err parazyd.org 70 i from time import time Err parazyd.org 70 i Err parazyd.org 70 i from lib.config import (aliases, arches, categories, cpunm, mainrepofiles, Err parazyd.org 70 i- repos, spooldir, suites) Err parazyd.org 70 i+ repos, spooldir, suites, skips) Err parazyd.org 70 i from lib.lock import check_lock, free_lock Err parazyd.org 70 i from lib.net import download Err parazyd.org 70 i from lib.parse import parse_release Err parazyd.org 70 it@@ -41,7 +41,6 @@ def pop_dirs(repo): Err parazyd.org 70 i suite = aliases[repodata['name']][j] Err parazyd.org 70 i elif repodata['skipmissing'] is True: Err parazyd.org 70 i continue Err parazyd.org 70 i- skips = ['jessie-security', 'ascii-security'] # hack Err parazyd.org 70 i if repo == 'debian' and j in skips: Err parazyd.org 70 i continue Err parazyd.org 70 i pair = (join(baseurl, suite), 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@@ -13,7 +13,7 @@ from time import time 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 i+ spooldir, srcfiles, suites, skips) Err parazyd.org 70 i from lib.lock import check_lock, free_lock Err parazyd.org 70 i from lib.package import (load_packages_file, merge_packages_many, Err parazyd.org 70 i write_packages) Err parazyd.org 70 it@@ -42,7 +42,6 @@ def prepare_merge_dict(): Err parazyd.org 70 i tmpsuite = aliases[repos[repo]['name']][suite] Err parazyd.org 70 i elif repos[repo]['skipmissing'] is True: Err parazyd.org 70 i tmpsuite = None Err parazyd.org 70 i- skips = ['jessie-security', 'ascii-security'] Err parazyd.org 70 i if repo == 'debian' and suite in skips: Err parazyd.org 70 i tmpsuite = None Err parazyd.org 70 i if tmpsuite: # make it a proper path 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@@ -12,7 +12,7 @@ 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.config import aliases, cpunm, repos, repo_order, spooldir, skips Err parazyd.org 70 i from lib.lock import check_lock, free_lock Err parazyd.org 70 i from lib.log import info, warn Err parazyd.org 70 i from lib.parse import compare_dict, get_date, get_time, parse_release Err parazyd.org 70 it@@ -110,7 +110,6 @@ def perform_update(suite, paths): Err parazyd.org 70 i sui = aliases[repos[j]['name']][suite] Err parazyd.org 70 i elif repos[j]['skipmissing']: Err parazyd.org 70 i sui = None Err parazyd.org 70 i- skips = ['jessie-security', 'ascii-security'] # hack Err parazyd.org 70 i if j == 'debian' and suite in skips: Err parazyd.org 70 i sui = None Err parazyd.org 70 i 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@@ -25,6 +25,9 @@ checksums = [ Err parazyd.org 70 i distrolabel = 'Devuan' Err parazyd.org 70 i repo_order = ['devuan', 'debian-security', 'debian'] Err parazyd.org 70 i Err parazyd.org 70 i+# used for a hacky way to skip certain suites when crawling Debian Err parazyd.org 70 i+skips = ['jessie-security', 'ascii-security'] Err parazyd.org 70 i+ Err parazyd.org 70 i repos = { Err parazyd.org 70 i 'devuan': { Err parazyd.org 70 i 'name': 'DEVUAN', Err parazyd.org 70 .