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 1QTX4b-00051c-5T for garchives@archives.gentoo.org; Mon, 06 Jun 2011 10:30:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BC2B1C045; Mon, 6 Jun 2011 10:30:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1DBCF1C045 for ; Mon, 6 Jun 2011 10:30:07 +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 A1CA21B400C for ; Mon, 6 Jun 2011 10:30:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C77318003C for ; Mon, 6 Jun 2011 10:30:05 +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/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/getmaskingreason.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: de0657223812d7768e6b474d6db84d87fa2242ff Date: Mon, 6 Jun 2011 10:30:05 +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: 3f6476f5d38cec003d45936e79df847b commit: de0657223812d7768e6b474d6db84d87fa2242ff Author: Zac Medico gentoo org> AuthorDate: Mon Jun 6 10:29:48 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jun 6 10:29:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dde065722 getmaskingreason: assume myrepo arg is valid --- pym/portage/package/ebuild/getmaskingreason.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pym/portage/package/ebuild/getmaskingreason.py b/pym/portage= /package/ebuild/getmaskingreason.py index 4e3833d..c19066f 100644 --- a/pym/portage/package/ebuild/getmaskingreason.py +++ b/pym/portage/package/ebuild/getmaskingreason.py @@ -16,6 +16,12 @@ from _emerge.Package import Package =20 def getmaskingreason(mycpv, metadata=3DNone, settings=3DNone, portdb=3DNone, return_location=3DFalse, myrepo=3DNone): + """ + If specified, the myrepo argument is assumed it be valid. This + should be a safe assumption since portdbapi methods always + return valid repo names and valid "repository" metadata from + aux_get. + """ if settings is None: settings =3D portage.settings if portdb is None: @@ -24,9 +30,6 @@ def getmaskingreason(mycpv, metadata=3DNone, settings=3D= None, if not mysplit: raise ValueError(_("invalid CPV: %s") % mycpv) =20 - if myrepo: - myrepo =3D _gen_valid_repo(myrepo) - if metadata is None: db_keys =3D list(portdb._aux_cache_keys) try: @@ -36,10 +39,10 @@ def getmaskingreason(mycpv, metadata=3DNone, settings= =3DNone, if not portdb.cpv_exists(mycpv): raise else: - if not myrepo: + if myrepo is None: myrepo =3D _gen_valid_repo(metadata["repository"]) =20 - elif not myrepo: + elif myrepo is None: myrepo =3D metadata.get("repository") if myrepo is not None: myrepo =3D _gen_valid_repo(metadata["repository"])