Gentoo Archives: gentoo-portage-dev

From: Michael Palimaka <kensington@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Michael Palimaka <kensington@g.o>
Subject: [gentoo-portage-dev] [PATCH] Support the 'packages' profile file as a directory.
Date: Sun, 11 May 2014 19:35:50
Message-Id: 1399836938-1268-1-git-send-email-kensington@gentoo.org
1 This adds proof-of-concept support for bug #282296.
2 Current behaviour without this change is to traceback.
3 ---
4 pym/portage/_sets/profiles.py | 2 +-
5 pym/portage/package/ebuild/config.py | 2 +-
6 2 files changed, 2 insertions(+), 2 deletions(-)
7
8 diff --git a/pym/portage/_sets/profiles.py b/pym/portage/_sets/profiles.py
9 index 39a2968..48c29de 100644
10 --- a/pym/portage/_sets/profiles.py
11 +++ b/pym/portage/_sets/profiles.py
12 @@ -33,7 +33,7 @@ class PackagesSystemSet(PackageSet):
13 writemsg_level("\nPackagesSystemSet: profile paths: %s\n" % \
14 (self._profile_paths,), level=logging.DEBUG, noiselevel=-1)
15
16 - mylist = [grabfile_package(os.path.join(x, "packages"), verify_eapi=True) for x in self._profile_paths]
17 + mylist = [grabfile_package(os.path.join(x, "packages"), recursive=True, verify_eapi=True) for x in self._profile_paths]
18
19 if debug:
20 writemsg_level("\nPackagesSystemSet: raw packages: %s\n" % \
21 diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
22 index e104501..e294968 100644
23 --- a/pym/portage/package/ebuild/config.py
24 +++ b/pym/portage/package/ebuild/config.py
25 @@ -557,7 +557,7 @@ class config(object):
26 self.user_profile_dir = locations_manager.user_profile_dir
27
28 packages_list = [grabfile_package(os.path.join(x, "packages"),
29 - verify_eapi=True) for x in self.profiles]
30 + recursive=True, verify_eapi=True) for x in self.profiles]
31 self.packages = tuple(stack_lists(packages_list, incremental=1))
32
33 # revmaskdict
34 --
35 1.8.5.5

Replies