[gentoo-commits] proj/gentoopm:master commit in: gentoopm/pkgcorepm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     30405657a8ea0dcef1c26211154badcd50754edb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 12:40:13 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 12:40:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=30405657

pkgcore: use InvalidAtomStringError.

---
 gentoopm/pkgcorepm/atom.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gentoopm/pkgcorepm/atom.py b/gentoopm/pkgcorepm/atom.py
index 7c10925..c3969ab 100644
--- a/gentoopm/pkgcorepm/atom.py
+++ b/gentoopm/pkgcorepm/atom.py
@@ -4,13 +4,18 @@
 # Released under the terms of the 2-clause BSD license.
 
 from pkgcore.ebuild.atom import atom
-from pkgcore.util.parserestrict import parse_match
+from pkgcore.util.parserestrict import parse_match, ParseError
 
 from gentoopm.basepm.atom import PMAtom
+from gentoopm.exceptions import InvalidAtomStringError
 
 class PkgCoreAtom(PMAtom):
 	def __init__(self, s, pkg = None):
-		self._r = parse_match(s)
+		try:
+			self._r = parse_match(s)
+		except ParseError:
+			raise InvalidAtomStringError('Incorrect atom: %s' % s)
+
 		self._pkg = pkg
 
 	def __contains__(self, pkg):