From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8672C1382C5 for ; Sun, 4 Apr 2021 11:30:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D310FE0884; Sun, 4 Apr 2021 11:30:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67C47E0884 for ; Sun, 4 Apr 2021 11:30:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4B4C4335DC1 for ; Sun, 4 Apr 2021 11:30:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE72F478 for ; Sun, 4 Apr 2021 11:30:22 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1617535780.e29177fcd2950199afa4f83673c0771afb261123.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: repoman/lib/repoman/tests/simple/, repoman/lib/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: repoman/lib/repoman/main.py repoman/lib/repoman/tests/simple/test_simple.py X-VCS-Directories: repoman/lib/repoman/ repoman/lib/repoman/tests/simple/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e29177fcd2950199afa4f83673c0771afb261123 X-VCS-Branch: master Date: Sun, 4 Apr 2021 11:30:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f7c0f7e8-3839-449e-8b7b-e335037c16ca X-Archives-Hash: 8be0f3364538af4be88b92a9cb03db7e commit: e29177fcd2950199afa4f83673c0771afb261123 Author: Zac Medico gentoo org> AuthorDate: Sun Apr 4 11:18:01 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Apr 4 11:29:40 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e29177fc repoman: fix --version TypeError Bug: https://bugs.gentoo.org/779967 Signed-off-by: Zac Medico gentoo.org> repoman/lib/repoman/main.py | 2 +- repoman/lib/repoman/tests/simple/test_simple.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/repoman/lib/repoman/main.py b/repoman/lib/repoman/main.py index 78be31df3..d84abf3ae 100755 --- a/repoman/lib/repoman/main.py +++ b/repoman/lib/repoman/main.py @@ -82,7 +82,7 @@ def _repoman_init(argv): if options.version: print("Repoman", VERSION, "(portage-%s)" % portage.VERSION) - return _repoman_main_vars(exitcode=0) + return _repoman_main_vars(None, 0, None, None, None, None, None) logger = logging.getLogger() diff --git a/repoman/lib/repoman/tests/simple/test_simple.py b/repoman/lib/repoman/tests/simple/test_simple.py index 60c62acc1..c4a864ff8 100644 --- a/repoman/lib/repoman/tests/simple/test_simple.py +++ b/repoman/lib/repoman/tests/simple/test_simple.py @@ -66,7 +66,7 @@ class RepomanRun(types.SimpleNamespace): args = ["-vvvv"] + args repoman_vars = _repoman_init(["repoman"] + args) if repoman_vars.exitcode is not None: - return repoman_vars.exitcode + return {"returncode": repoman_vars.exitcode} result = _repoman_scan(*repoman_vars) returncode = _handle_result(*repoman_vars, result) qawarnings = repoman_vars.vcs_settings.qatracker.qawarnings @@ -313,6 +313,7 @@ pkg_preinst() { } git_test = ( + ("", RepomanRun(args=["--version"])), ("", RepomanRun(args=["manifest"])), ("", git_cmd + ("config", "--global", "user.name", committer_name,)), ("", git_cmd + ("config", "--global", "user.email", committer_email,)),