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 BF1EC139694 for ; Thu, 23 Feb 2017 16:33:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19FE821C1EC; Thu, 23 Feb 2017 16:33:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9DE921C1EC for ; Thu, 23 Feb 2017 16:33:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA70E34162D for ; Thu, 23 Feb 2017 16:33:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63B1F51FD for ; Thu, 23 Feb 2017 16:33:47 +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: <1487865583.f4b0714010f1237280fd48dcb65989679917d20a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/__init__.py X-VCS-Directories: pym/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f4b0714010f1237280fd48dcb65989679917d20a X-VCS-Branch: master Date: Thu, 23 Feb 2017 16:33:47 +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-Archives-Salt: ed36ab27-fbc6-45c1-a7a0-b88f0ceb8c3d X-Archives-Hash: 613c1eff2331adfb99d9e08d8c3c8c2e commit: f4b0714010f1237280fd48dcb65989679917d20a Author: Zac Medico gentoo org> AuthorDate: Thu Feb 23 10:50:36 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Feb 23 15:59:43 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f4b07140 grabfile_package: support -* in profile "packages" files (bug 610670) Support -* in order to make it easier to create profiles for minimal systems (especially those built entirely from binary packages). X-Gentoo-Bug: 610670 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=610670 Acked-by: Brian Dolbec gentoo.org> pym/portage/util/__init__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index c2c871ffb..45710ba72 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -478,13 +478,20 @@ def grabfile_package(myfilename, compatlevel=0, recursive=0, eapi = read_corresponding_eapi_file( myfilename, default=eapi_default) mybasename = os.path.basename(myfilename) + is_packages_file = mybasename == 'packages' atoms = [] for pkg, source_file in pkgs: pkg_orig = pkg # for packages and package.mask files if pkg[:1] == "-": + if is_packages_file and pkg == '-*': + if remember_source_file: + atoms.append((pkg, source_file)) + else: + atoms.append(pkg) + continue pkg = pkg[1:] - if pkg[:1] == '*' and mybasename == 'packages': + if pkg[:1] == '*' and is_packages_file: pkg = pkg[1:] try: pkg = Atom(pkg, allow_wildcard=allow_wildcard,