From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6D7AA1387FD for ; Sat, 14 Jun 2014 20:59:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1FD2E0B2D; Sat, 14 Jun 2014 20:59:00 +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 42757E0BB6 for ; Sat, 14 Jun 2014 20:59:00 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FA4733FDC1 for ; Sat, 14 Jun 2014 20:58:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 85D8818743 for ; Sat, 14 Jun 2014 20:58:57 +0000 (UTC) From: "Alexander Berntsen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Berntsen" Message-ID: <1402778915.e3ecbad92c28d793a073019e7df81bb5ec84cc81.bernalex@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/_sets/, pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/_sets/profiles.py pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/_sets/ pym/portage/package/ebuild/ X-VCS-Committer: bernalex X-VCS-Committer-Name: Alexander Berntsen X-VCS-Revision: e3ecbad92c28d793a073019e7df81bb5ec84cc81 X-VCS-Branch: master Date: Sat, 14 Jun 2014 20:58:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 95fd9678-e263-4a75-8388-f907b8309fcd X-Archives-Hash: 329ed13c7635a3ffd161f7162cc44188 commit: e3ecbad92c28d793a073019e7df81bb5ec84cc81 Author: Alexander Berntsen gentoo org> AuthorDate: Fri May 16 13:32:43 2014 +0000 Commit: Alexander Berntsen gentoo 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 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