Gentoo Archives: gentoo-portage-dev

From: Alexander Berntsen <bernalex@g.o>
To: gentoo-portage-dev@l.g.o
Subject: [gentoo-portage-dev] [PATCH 1/2] Revert 'packages' profile as directory patches
Date: Fri, 16 May 2014 15:05:48
Message-Id: 1400252732-5850-1-git-send-email-bernalex@gentoo.org
1 This reverts commit 0c416cbb70858a5db2a1a23b2e90a95c0a1f2ea8 and
2 b4d8e300c04b768be7cd5c64116d6cc0453219b4.
3
4 Jorge Manuel B. S. Vicetto pointed out[0] that this is not useful. The
5 commits were made by me after talking to Michael Palimaka on IRC.
6 Apparently I did not get the full story straight, and made the commits
7 prematurely.
8
9 [0] https://bugs.gentoo.org/show_bug.cgi?id=282296#c14
10 ---
11 pym/portage/_sets/profiles.py | 4 +---
12 pym/portage/package/ebuild/config.py | 2 +-
13 2 files changed, 2 insertions(+), 4 deletions(-)
14
15 diff --git a/pym/portage/_sets/profiles.py b/pym/portage/_sets/profiles.py
16 index 7135d7f..39a2968 100644
17 --- a/pym/portage/_sets/profiles.py
18 +++ b/pym/portage/_sets/profiles.py
19 @@ -33,9 +33,7 @@ class PackagesSystemSet(PackageSet):
20 writemsg_level("\nPackagesSystemSet: profile paths: %s\n" % \
21 (self._profile_paths,), level=logging.DEBUG, noiselevel=-1)
22
23 - mylist = [grabfile_package(os.path.join(x, "packages"),
24 - recursive=True,
25 - verify_eapi=True) for x in self._profile_paths]
26 + mylist = [grabfile_package(os.path.join(x, "packages"), verify_eapi=True) for x in self._profile_paths]
27
28 if debug:
29 writemsg_level("\nPackagesSystemSet: raw packages: %s\n" % \
30 diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
31 index e294968..e104501 100644
32 --- a/pym/portage/package/ebuild/config.py
33 +++ b/pym/portage/package/ebuild/config.py
34 @@ -557,7 +557,7 @@ class config(object):
35 self.user_profile_dir = locations_manager.user_profile_dir
36
37 packages_list = [grabfile_package(os.path.join(x, "packages"),
38 - recursive=True, verify_eapi=True) for x in self.profiles]
39 + verify_eapi=True) for x in self.profiles]
40 self.packages = tuple(stack_lists(packages_list, incremental=1))
41
42 # revmaskdict
43 --
44 1.8.3.2

Replies

Subject Author
[gentoo-portage-dev] [PATCH 2/2] Turn a traceback into a graceful error Alexander Berntsen <bernalex@g.o>