* [gentoo-commits] proj/portage:master commit in: pym/portage/_sets/, pym/portage/package/ebuild/
@ 2014-05-12 10:13 Alexander Berntsen
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Berntsen @ 2014-05-12 10:13 UTC (permalink / raw
To: gentoo-commits
commit: b4d8e300c04b768be7cd5c64116d6cc0453219b4
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun May 11 19:35:38 2014 +0000
Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Mon May 12 10:07:23 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b4d8e300
Support the 'packages' profile file as a directory
This adds proof-of-concept support for bug #282296. Current behaviour
without this change is to print a traceback.
Reviewed-by: Alexander Berntsen <bernalex <AT> gentoo.org>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/portage/_sets/, pym/portage/package/ebuild/
@ 2014-06-14 20:58 Alexander Berntsen
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Berntsen @ 2014-06-14 20:58 UTC (permalink / raw
To: gentoo-commits
commit: e3ecbad92c28d793a073019e7df81bb5ec84cc81
Author: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
AuthorDate: Fri May 16 13:32:43 2014 +0000
Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 20:48:35 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e3ecbad9
Revert 'packages' profile as directory patches
This reverts commit 0c416cbb70858a5db2a1a23b2e90a95c0a1f2ea8 and
b4d8e300c04b768be7cd5c64116d6cc0453219b4.
Jorge Manuel B. S. Vicetto pointed out[0] that this is not useful. The
commits were made by me after talking to Michael Palimaka on IRC.
Apparently I did not get the full story straight, and made the commits
prematurely.
[0] https://bugs.gentoo.org/show_bug.cgi?id=282296#c14
Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org>
---
pym/portage/_sets/profiles.py | 4 +---
pym/portage/package/ebuild/config.py | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/pym/portage/_sets/profiles.py b/pym/portage/_sets/profiles.py
index 7135d7f..39a2968 100644
--- a/pym/portage/_sets/profiles.py
+++ b/pym/portage/_sets/profiles.py
@@ -33,9 +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"),
- recursive=True,
- verify_eapi=True) for x in self._profile_paths]
+ mylist = [grabfile_package(os.path.join(x, "packages"), 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 e294968..e104501 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"),
- recursive=True, verify_eapi=True) for x in self.profiles]
+ verify_eapi=True) for x in self.profiles]
self.packages = tuple(stack_lists(packages_list, incremental=1))
# revmaskdict
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-14 20:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-14 20:58 [gentoo-commits] proj/portage:master commit in: pym/portage/_sets/, pym/portage/package/ebuild/ Alexander Berntsen
-- strict thread matches above, loose matches on Subject: below --
2014-05-12 10:13 Alexander Berntsen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox