summaryrefslogtreecommitdiffstats
path: root/pym/portage/update.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-09-13 05:53:18 +0000
committerZac Medico <zmedico@gentoo.org>2008-09-13 05:53:18 +0000
commit3c59a39056452c2592478f41929e0bab493b68d4 (patch)
tree5014fd3e46905ce5a16f7c07a8a650bc3049b63e /pym/portage/update.py
parent08330cc73276d1cf3a75335995fe51fd636f39b1 (diff)
downloadportage-3c59a39056452c2592478f41929e0bab493b68d4.tar.gz
portage-3c59a39056452c2592478f41929e0bab493b68d4.tar.bz2
portage-3c59a39056452c2592478f41929e0bab493b68d4.zip
Move the world file update code out of update_config_files() since it should
not be relative to PORTAGE_CONFIGROOT. Thanks to grobian for reporting. svn path=/main/trunk/; revision=11508
Diffstat (limited to 'pym/portage/update.py')
-rw-r--r--pym/portage/update.py13
1 files changed, 0 insertions, 13 deletions
diff --git a/pym/portage/update.py b/pym/portage/update.py
index 36108dd22..85d07f5a3 100644
--- a/pym/portage/update.py
+++ b/pym/portage/update.py
@@ -177,19 +177,6 @@ def update_config_files(config_root, protect, protect_mask, update_iter):
del file_contents[x]
continue
- worldlist = grabfile(os.path.join(config_root, WORLD_FILE))
- modified = False
- for update_cmd in update_iter:
- for pos, atom in enumerate(worldlist):
- new_atom = update_dbentry(update_cmd, atom)
- if atom != new_atom:
- worldlist[pos] = new_atom
- modified = True
- if modified:
- worldlist.sort()
- write_atomic(os.path.join(config_root, WORLD_FILE),
- "\n".join(worldlist)+"\n")
-
# update /etc/portage/packages.*
ignore_line_re = re.compile(r'^#|^\s*$')
for update_cmd in update_iter: