Bug #229859 - Also add atom validation to match().
authorZac Medico <zmedico@gentoo.org>
Sat, 28 Jun 2008 22:14:25 +0000 (22:14 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 28 Jun 2008 22:14:25 +0000 (22:14 -0000)
svn path=/main/trunk/; revision=10837

bin/portageq

index b7cd1186954154cce52419d9fc3d7ce1e8f9bbee..5b7f5f72f98952e54bb89d138cec9560de7ff897 100755 (executable)
@@ -276,6 +276,10 @@ def match(argv):
                sys.exit(2)
        root, atom = argv
        if atom:
+               if atom_validate_strict and not portage.isvalidatom(atom):
+                       portage.writemsg("ERROR: Invalid atom: '%s'\n" % atom,
+                               noiselevel=-1)
+                       return 2
                results = portage.db[root]["vartree"].dbapi.match(atom)
        else:
                results = portage.db[root]["vartree"].dbapi.cpv_all()