public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Michael Palimaka <kensington@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Cc: Michael Palimaka <kensington@gentoo.org>
Subject: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.
Date: Sun, 11 May 2014 19:35:38 +0000	[thread overview]
Message-ID: <1399836938-1268-1-git-send-email-kensington@gentoo.org> (raw)

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



             reply	other threads:[~2014-05-11 19:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-11 19:35 Michael Palimaka [this message]
2014-05-12 10:14 ` [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory Alexander Berntsen
2014-05-12 17:59   ` Alec Warner
2014-05-12 18:20   ` Sebastian Luther
2014-05-12 18:45   ` Brian Dolbec
2014-05-12 19:43     ` Alexander Berntsen
2014-05-12 20:06       ` Sebastian Luther
2014-05-12 20:39         ` Alexander Berntsen
2014-05-12 21:16           ` Brian Dolbec
2014-05-12 21:24             ` Alexander Berntsen
2014-05-12 21:47               ` Brian Dolbec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399836938-1268-1-git-send-email-kensington@gentoo.org \
    --to=kensington@gentoo.org \
    --cc=gentoo-portage-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox