From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RJcUl-0000tZ-Dk for garchives@archives.gentoo.org; Fri, 28 Oct 2011 02:48:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FD4AE0603; Fri, 28 Oct 2011 02:48:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 20B9EE0603 for ; Fri, 28 Oct 2011 02:48:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7ED8D1B401A for ; Fri, 28 Oct 2011 02:48:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E913E80042 for ; Fri, 28 Oct 2011 02:48:25 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/_config/LocationsManager.py pym/portage/package/ebuild/_config/MaskManager.py X-VCS-Directories: pym/portage/package/ebuild/_config/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d3acfaa3e8a61ab86edfe04e9a37c77737d9998b Date: Fri, 28 Oct 2011 02:48:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 9a98c6443dea5a7a039241f987c84b38 commit: d3acfaa3e8a61ab86edfe04e9a37c77737d9998b Author: Zac Medico gentoo org> AuthorDate: Fri Oct 28 02:48:16 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 28 02:48:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dd3acfaa3 MaskManager: portage-1-compat warnings.warn --- .../package/ebuild/_config/LocationsManager.py | 5 ++--- pym/portage/package/ebuild/_config/MaskManager.py | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym= /portage/package/ebuild/_config/LocationsManager.py index ec3f003..244b7e0 100644 --- a/pym/portage/package/ebuild/_config/LocationsManager.py +++ b/pym/portage/package/ebuild/_config/LocationsManager.py @@ -136,15 +136,14 @@ class LocationsManager(object): offenders =3D sorted(x for x in offenders if os.path.isdir(os.path.join(currentPath, x))) if offenders: - warnings.warn((_("Profile '%(profile_path)s' in repository " + warnings.warn(_("Profile '%(profile_path)s' in repository " "'%(repo_name)s' is implicitly using 'portage-1' profile format, bu= t " "the repository profiles are not marked as that format. This will = break " "in the future. Please either convert the following paths " "to files, or add\nprofile-formats =3D portage-1\nto the " "repositories layout.conf. Files: '%(files)s'\n") % dict(profile_path=3DcurrentPath, repo_name=3Drepo_loc, - files=3D', '.join(offenders))), - ) + files=3D', '.join(offenders))) =20 parentsFile =3D os.path.join(currentPath, "parent") eapi_file =3D os.path.join(currentPath, "eapi") diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/port= age/package/ebuild/_config/MaskManager.py index affa5af..64a1c5e 100644 --- a/pym/portage/package/ebuild/_config/MaskManager.py +++ b/pym/portage/package/ebuild/_config/MaskManager.py @@ -5,6 +5,8 @@ __all__ =3D ( 'MaskManager', ) =20 +import warnings + from portage import os from portage.dep import ExtendedAtomDict, match_from_list, _repo_separat= or, _slot_separator from portage.localization import _ @@ -40,14 +42,13 @@ class MaskManager(object): recursive=3Drepo_config.portage1_profiles, remember_source_file=3DTrue, verify_eapi=3DTrue) if repo_config.portage1_profiles_compat and os.path.isdir(path): - writemsg((_("Repository '%(repo_name)s' is implicitly using " + warnings.warn(_("Repository '%(repo_name)s' is implicitly using " "'portage-1' profile format in its profiles/package.mask, but " "the repository profiles are not marked as that format. This will= break " "in the future. Please either convert the following paths " "to files, or add\nprofile-format =3D portage-1\nto the " "repositories layout.conf.\n") - % dict(repo_name=3Drepo_config.name)), - noiselevel=3D-1) + % dict(repo_name=3Drepo_config.name)) =20 return pmask_cache[loc] =20