From 3964690033e37c097b7ba2e207c0962144761757 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 30 Mar 2021 23:25:04 -0700 Subject: [PATCH 1/4] repoman: correct parse_args local sys.argv reference Signed-off-by: Zac Medico --- repoman/lib/repoman/argparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repoman/lib/repoman/argparser.py b/repoman/lib/repoman/argparser.py index 6d545ccca0..47215693c4 100644 --- a/repoman/lib/repoman/argparser.py +++ b/repoman/lib/repoman/argparser.py @@ -1,5 +1,5 @@ # repoman: Argument parser -# Copyright 2007-2019 Gentoo Authors +# Copyright 2007-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 """This module contains functions used in Repoman to parse CLI arguments.""" @@ -222,7 +222,7 @@ def parse_args(argv, repoman_default_opts): if not opts.ignore_default_opts: default_opts = util.shlex_split(repoman_default_opts) if default_opts: - opts = parser.parse_args(default_opts + sys.argv[1:]) + opts = parser.parse_args(default_opts + argv[1:]) args = [] if opts.mode is not None: From 1b0cbed41a380e9603b12b1f1dec1e6dd42a8aeb Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 30 Mar 2021 23:33:04 -0700 Subject: [PATCH 2/4] repoman/lib/repoman/argparser.py: W0611: Unused import sys (unused-import) Signed-off-by: Zac Medico --- repoman/lib/repoman/argparser.py | 1 - 1 file changed, 1 deletion(-) diff --git a/repoman/lib/repoman/argparser.py b/repoman/lib/repoman/argparser.py index 47215693c4..495fdfa601 100644 --- a/repoman/lib/repoman/argparser.py +++ b/repoman/lib/repoman/argparser.py @@ -6,7 +6,6 @@ import argparse import logging -import sys # import our initialized portage instance from repoman._portage import portage From d04486767159f9dba443e7a9d1a6c3854db00400 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 31 Mar 2021 00:30:51 -0700 Subject: [PATCH 3/4] repoman: fix ModuleConfig _not_installed path (bug 779055) Bug: https://bugs.gentoo.org/779055 Signed-off-by: Zac Medico --- repoman/lib/repoman/modules/scan/module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repoman/lib/repoman/modules/scan/module.py b/repoman/lib/repoman/modules/scan/module.py index 3321cb224b..41c1becfcc 100644 --- a/repoman/lib/repoman/modules/scan/module.py +++ b/repoman/lib/repoman/modules/scan/module.py @@ -31,9 +31,9 @@ def __init__(self, configpaths, valid_versions=None, repository_modules=False): if repository_modules: self.configpaths = [os.path.join(path, 'repository.yaml') for path in configpaths] elif _not_installed: - self.configpaths = [os.path.realpath(os.path.join(os.path.dirname( + self.configpaths = [os.path.realpath(os.path.join( os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname( - os.path.dirname(__file__)))))), 'repoman/cnf/repository/repository.yaml'))] + os.path.dirname(__file__))))), 'cnf/repository/repository.yaml'))] else: self.configpaths = [os.path.join(portage.const.EPREFIX or '/', 'usr/share/repoman/repository/repository.yaml')] From b09b4071151d8e3a81f3576843d00f88eb407799 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 31 Mar 2021 00:45:23 -0700 Subject: [PATCH 4/4] SimpleRepomanTestCase: use -vvvv for debug mode Signed-off-by: Zac Medico --- repoman/lib/repoman/tests/simple/test_simple.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/repoman/lib/repoman/tests/simple/test_simple.py b/repoman/lib/repoman/tests/simple/test_simple.py index 3a699a708b..60c62acc1a 100644 --- a/repoman/lib/repoman/tests/simple/test_simple.py +++ b/repoman/lib/repoman/tests/simple/test_simple.py @@ -62,6 +62,8 @@ async def run(self): def _subprocess(args, cwd, env, expected, debug): os.chdir(cwd) os.environ.update(env) + if debug: + args = ["-vvvv"] + args repoman_vars = _repoman_init(["repoman"] + args) if repoman_vars.exitcode is not None: return repoman_vars.exitcode