From 4ba23115b68d6bdce4d83c27c882013bbd918199 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 9 Dec 2006 20:13:04 +0000 Subject: Make isvalidatom() (and thus repoman) reject atoms containing |() characters. Thanks to Brian Harring for the suggestion. svn path=/main/trunk/; revision=5241 --- pym/portage_dep.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pym/portage_dep.py b/pym/portage_dep.py index 413e87cbb..f0f272787 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -18,7 +18,7 @@ # "a? ( b? ( z ) ) -- Valid # -import os,string,types,sys,copy +import re, string, sys, types import portage_exception from portage_versions import catpkgsplit, catsplit, pkgcmp, pkgsplit, ververify @@ -303,6 +303,8 @@ def dep_getslot(mydep): return mydep[colon+1:] return None +_invalid_atom_chars_regexp = re.compile("[()|]") + def isvalidatom(atom): """ Check to see if a depend atom is valid @@ -320,6 +322,9 @@ def isvalidatom(atom): 1) 0 if the atom is invalid 2) 1 if the atom is valid """ + global _invalid_atom_chars_regexp + if _invalid_atom_chars_regexp.search(atom): + return 0 mycpv_cps = catpkgsplit(dep_getcpv(atom)) operator = get_operator(atom) if operator: -- cgit v1.2.3-1-g7c22