From f0fef5887ddcf539c7d375ddd7cd955c2c6221ce Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Oct 11 2017 04:20:20 +0000 Subject: Fix some problems - resolve pylint errors - set repo.srcrepo correctly The metadata loading bug looks to be the culprit for the cryptic tracebacks from libsolv. --- diff --git a/fedmod/_depchase.py b/fedmod/_depchase.py index 95b144d..bb34ccf 100644 --- a/fedmod/_depchase.py +++ b/fedmod/_depchase.py @@ -279,7 +279,7 @@ class Repo(object): return True filename = repodata.lookup_str(solv.SOLVID_META, solv.REPOSITORY_REPOMD_LOCATION) filechksum = repodata.lookup_checksum(solv.SOLVID_META, solv.REPOSITORY_REPOMD_CHECKSUM) - f = self.download(filename, True, filechksum) + f = self.read_repo_metadata(filename, True, filechksum) if not f: return False if ext == "FL": @@ -309,9 +309,9 @@ def load_stub(repodata): def setup_repos(): - repo = Repo("f27", LOCAL_REPO_INFO_ARCH) - repo.srcrepo = "f27-source" srcrepo = Repo("f27-source", LOCAL_REPO_INFO_SOURCE) + repo = Repo("f27", LOCAL_REPO_INFO_ARCH) + repo.srcrepo = srcrepo return [repo, srcrepo] def setup_pool(arch, repos=()): @@ -322,7 +322,6 @@ def setup_pool(arch, repos=()): for repo in repos: repo.metadata_path = repo.metadata_path.format(arch=arch) - print(repo.name, repo.metadata_path) for repo in repos: assert repo.load(pool) @@ -375,7 +374,7 @@ def get_sourcepkg(p, s=None, only_name=False): def print_transaction(pool, transaction): candq = transaction.newpackages() - if logger.getEffectiveLevel() <= logging.INFO: + if log.getEffectiveLevel() <= logging.INFO: tb = smartcols.Table() tb.title = "DEPENDENCY INFORMATION" cl = tb.new_column("INFO") @@ -403,7 +402,7 @@ def print_transaction(pool, transaction): lnc = lnss first = False lnc[cl_match] = str(m) - logger.info(tb) + log.info(tb) def solve(solver, pkgnames, selfhost=False): pool = solver.pool