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 1RBG16-0001lI-3Z for garchives@archives.gentoo.org; Wed, 05 Oct 2011 01:11:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAA4C21C04F; Wed, 5 Oct 2011 01:11:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8A93E21C04F for ; Wed, 5 Oct 2011 01:11:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A1AC1B4028 for ; Wed, 5 Oct 2011 01:11:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 575B880042 for ; Wed, 5 Oct 2011 01:11:13 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <165d248d44308f9b7620d7eb2e3d3a265ef2b812.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 165d248d44308f9b7620d7eb2e3d3a265ef2b812 Date: Wed, 5 Oct 2011 01:11:13 +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: fc4cc5905df4e1cd22f5ccc700011fb0 commit: 165d248d44308f9b7620d7eb2e3d3a265ef2b812 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Wed Oct 5 01:09:53 2011 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Wed Oct 5 01:09:53 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D165d248d Mark some messages for translation. --- pym/portage/repository/config.py | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/co= nfig.py index e3027a7..9f4ac2b 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -390,25 +390,29 @@ class RepoConfigLoader(object): if manifest_hashes is not None: manifest_hashes =3D frozenset(manifest_hashes.upper().split()) if MANIFEST2_REQUIRED_HASH not in manifest_hashes: - warnings.warn(("Repository named '%s' has a " + warnings.warn((_("Repository named '%(repo_name)s' has a " "'manifest-hashes' setting that does not contain " - "the '%s' hash which is required by this " + "the '%(hash)s' hash which is required by this " "portage version. You will have to upgrade portage " "if you want to generate valid manifests for this " - "repository: %s" % (repo.name, - MANIFEST2_REQUIRED_HASH, - layout_filename)), DeprecationWarning) + "repository: %(layout_filename)s") % + {"repo_name":repo.name, + "hash":MANIFEST2_REQUIRED_HASH, + "layout_filename":layout_filename}), + DeprecationWarning) unsupported_hashes =3D manifest_hashes.difference( MANIFEST2_HASH_FUNCTIONS) if unsupported_hashes: - warnings.warn(("Repository named '%s' has a " + warnings.warn((_("Repository named '%(repo_name)s' has a " "'manifest-hashes' setting that contains one " - "or more hash types '%s' which are not supported by " + "or more hash types '%(hashes)s' which are not supported by " "this portage version. You will have to upgrade " "portage if you want to generate valid manifests for " - "this repository: %s" % (repo.name, - " ".join(sorted(unsupported_hashes)), - layout_filename)), DeprecationWarning) + "this repository: %(layout_filename)s") % + {"repo_name":repo.name, + "hashes":" ".join(sorted(unsupported_hashes)), + "layout_filename":layout_filename}), + DeprecationWarning) repo.manifest_hashes =3D manifest_hashes =20 repo.cache_is_authoritative =3D layout_data.get('authoritative-cache'= , 'false').lower() =3D=3D 'true'