diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-01-12 06:10:59 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-01-12 06:10:59 +0000 |
| commit | 3241f5b53d022a9e1bbeb925a0100504ef76000f (patch) | |
| tree | 9354bb50246039ae64303752d790faf05582b77f | |
| parent | For bug #88485, show the location of the build log whenever a build fails. (diff) | |
| download | portage-multirepo-3241f5b53d022a9e1bbeb925a0100504ef76000f.tar.gz portage-multirepo-3241f5b53d022a9e1bbeb925a0100504ef76000f.tar.bz2 portage-multirepo-3241f5b53d022a9e1bbeb925a0100504ef76000f.zip | |
Prevent an InvalidData exception during global updates due to the new stricter catpkgsplit behavior.
svn path=/main/trunk/; revision=5591
| -rw-r--r-- | pym/portage_update.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage_update.py b/pym/portage_update.py index f156c39b..1a2a1d88 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) |