From 3241f5b53d022a9e1bbeb925a0100504ef76000f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 12 Jan 2007 06:10:59 +0000 Subject: Prevent an InvalidData exception during global updates due to the new stricter catpkgsplit behavior. svn path=/main/trunk/; revision=5591 --- pym/portage_update.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pym/portage_update.py') diff --git a/pym/portage_update.py b/pym/portage_update.py index f156c39bc..1a2a1d884 100644 --- a/pym/portage_update.py +++ b/pym/portage_update.py @@ -188,7 +188,13 @@ def update_config_files(config_root, protect, protect_mask, update_iter): line = file_contents[x][mypos] if line[0] == "#" or not line.strip(): continue - key = dep_getkey(line.split()[0]) + myatom = line.split()[0] + if myatom.startswith("-"): + # package.mask supports incrementals + myatom = myatom[1:] + if not isvalidatom(myatom): + continue + key = dep_getkey(myatom) if key == old_value: file_contents[x][mypos] = \ line.replace(old_value, new_value) -- cgit v1.2.3-1-g7c22