From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 25B1E1381FA for ; Sun, 11 May 2014 19:35:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D9C1E09F9; Sun, 11 May 2014 19:35:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D475E099B for ; Sun, 11 May 2014 19:35:48 +0000 (UTC) Received: by smtp.gentoo.org (Postfix, from userid 2323) id 8959833FDB2; Sun, 11 May 2014 19:35:47 +0000 (UTC) From: Michael Palimaka To: gentoo-portage-dev@lists.gentoo.org Cc: Michael Palimaka Subject: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory. Date: Sun, 11 May 2014 19:35:38 +0000 Message-Id: <1399836938-1268-1-git-send-email-kensington@gentoo.org> X-Mailer: git-send-email 1.8.3.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 2b440c0c-2577-4971-88c7-85705210f218 X-Archives-Hash: b8bb4be12c308e78c26ffc3bac8a0700 This adds proof-of-concept support for bug #282296. Current behaviour without this change is to traceback. --- pym/portage/_sets/profiles.py | 2 +- pym/portage/package/ebuild/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/_sets/profiles.py b/pym/portage/_sets/profiles.py index 39a2968..48c29de 100644 --- a/pym/portage/_sets/profiles.py +++ b/pym/portage/_sets/profiles.py @@ -33,7 +33,7 @@ class PackagesSystemSet(PackageSet): writemsg_level("\nPackagesSystemSet: profile paths: %s\n" % \ (self._profile_paths,), level=logging.DEBUG, noiselevel=-1) - mylist = [grabfile_package(os.path.join(x, "packages"), verify_eapi=True) for x in self._profile_paths] + mylist = [grabfile_package(os.path.join(x, "packages"), recursive=True, verify_eapi=True) for x in self._profile_paths] if debug: writemsg_level("\nPackagesSystemSet: raw packages: %s\n" % \ diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index e104501..e294968 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -557,7 +557,7 @@ class config(object): self.user_profile_dir = locations_manager.user_profile_dir packages_list = [grabfile_package(os.path.join(x, "packages"), - verify_eapi=True) for x in self.profiles] + recursive=True, verify_eapi=True) for x in self.profiles] self.packages = tuple(stack_lists(packages_list, incremental=1)) # revmaskdict -- 1.8.5.5