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 <gentoo-commits+bounces-391793-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RETIU-0003Cf-VV
for garchives@archives.gentoo.org; Thu, 13 Oct 2011 21:58:39 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 40E6421C1E3;
Thu, 13 Oct 2011 21:58:31 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 13FF221C1E3
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Oct 2011 21:58:31 +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 A90351B4013
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Oct 2011 21:58:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id E3E3B80042
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Oct 2011 21:58:29 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <bf28492ed8ccc7fd3679a8e5433101a0945d417d.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/quickpkg
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: bf28492ed8ccc7fd3679a8e5433101a0945d417d
Date: Thu, 13 Oct 2011 21:58:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: fe208b6bc701123d924e0eccf2700ea6
commit: bf28492ed8ccc7fd3679a8e5433101a0945d417d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 21:58:17 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 21:58:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Dbf28492e
quickpkg: use AmbiguousPackageName
---
bin/quickpkg | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/quickpkg b/bin/quickpkg
index a326bd4..6947224 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -22,8 +22,8 @@ from portage import os
from portage import xpak
from portage.dbapi.dep_expand import dep_expand
from portage.dep import Atom, extended_cp_match, use_reduce
-from portage.exception import InvalidAtom, InvalidData, InvalidDependStr=
ing, \
- PackageSetNotFound, PermissionDenied
+from portage.exception import (AmbiguousPackageName, InvalidAtom, Invali=
dData,
+ InvalidDependString, PackageSetNotFound, PermissionDenied)
from portage.util import ConfigProtect, ensure_dirs, shlex_split
from portage.dbapi.vartree import dblink, tar_contents
from portage.checksum import perform_md5
@@ -43,7 +43,7 @@ def quickpkg_atom(options, infos, arg, eout):
=20
try:
atom =3D dep_expand(arg, mydb=3Dvardb, settings=3Dvartree.settings)
- except ValueError as e:
+ except AmbiguousPackageName as e:
# Multiple matches thrown from cpv_expand
eout.eerror("Please use a more specific atom: %s" % \
" ".join(e.args[0]))