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 3D3F21382C5 for ; Thu, 28 Jan 2021 02:41:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82CDAE0A82; Thu, 28 Jan 2021 02:41:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 562B3E0A82 for ; Thu, 28 Jan 2021 02:41:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 AEA943410C4 for ; Thu, 28 Jan 2021 02:41:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F23B4AC for ; Thu, 28 Jan 2021 02:41:42 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1611799606.b8b6de7bc84677d9ae13cf8bfff2c0e6a281ff75.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/support.py X-VCS-Directories: catalyst/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: b8b6de7bc84677d9ae13cf8bfff2c0e6a281ff75 X-VCS-Branch: master Date: Thu, 28 Jan 2021 02:41:42 +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: 8ef1c88e-a658-4245-a956-9c8266f3013f X-Archives-Hash: f1228372e57f8f758cfb3d971b1c10ef Message-ID: <20210128024142.GKOGHa4vJvi73ThXv1FgRIaZ_fgQ1FZ_lzCASOEL7gc@z> commit: b8b6de7bc84677d9ae13cf8bfff2c0e6a281ff75 Author: Matt Turner gentoo org> AuthorDate: Sun Jan 24 02:34:06 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Jan 28 02:06:46 2021 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b8b6de7b catalyst: Remove fallback make.conf parsing code Signed-off-by: Matt Turner gentoo.org> catalyst/support.py | 42 +++--------------------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/catalyst/support.py b/catalyst/support.py index f3a865a7..fa652987 100644 --- a/catalyst/support.py +++ b/catalyst/support.py @@ -2,7 +2,6 @@ import glob import sys import os -import re import shutil import time from pathlib import Path @@ -12,6 +11,8 @@ import libmount from portage.repository.config import RepoConfig +from snakeoil.bash import read_bash_dict + from catalyst import log BASH_BINARY = "/bin/bash" @@ -135,47 +136,10 @@ defined are not preserved. In other words, "foo", "bar", "oni" ordering is prese print_traceback=True) -def parse_makeconf(mylines): - mymakeconf = {} - pos = 0 - pat = re.compile("([0-9a-zA-Z_]*)=(.*)") - while pos < len(mylines): - if len(mylines[pos]) <= 1: - # skip blanks - pos += 1 - continue - if mylines[pos][0] in ["#", " ", "\t"]: - # skip indented lines, comments - pos += 1 - continue - else: - myline = mylines[pos] - mobj = pat.match(myline) - pos += 1 - if mobj.group(2): - clean_string = re.sub(r"\"", r"", mobj.group(2)) - mymakeconf[mobj.group(1)] = clean_string - return mymakeconf - - def read_makeconf(mymakeconffile): if os.path.exists(mymakeconffile): try: - try: - import snakeoil.bash # import snakeoil.fileutils - return snakeoil.bash.read_bash_dict(mymakeconffile, sourcing_command="source") - except ImportError: - try: - import portage.util - return portage.util.getconfig(mymakeconffile, tolerant=1, allow_sourcing=True) - except Exception: - try: - import portage_util - return portage_util.getconfig(mymakeconffile, tolerant=1, allow_sourcing=True) - except ImportError: - with open(mymakeconffile, "r") as myf: - mylines = myf.readlines() - return parse_makeconf(mylines) + return read_bash_dict(mymakeconffile, sourcing_command="source") except Exception: raise CatalystError("Could not parse make.conf file " + mymakeconffile, print_traceback=True)