summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-09-15 10:49:57 +0000
committerZac Medico <zmedico@gentoo.org>2006-09-15 10:49:57 +0000
commit9e16ff3f854356fd87718bdced19d2e4dbb19747 (patch)
treec559fa7348b0bc91000c81870de27b22e135158d
parentb395b3c44ff586c68064718e9cdad873caca66a2 (diff)
downloadportage-9e16ff3f854356fd87718bdced19d2e4dbb19747.tar.gz
portage-9e16ff3f854356fd87718bdced19d2e4dbb19747.tar.bz2
portage-9e16ff3f854356fd87718bdced19d2e4dbb19747.zip
When it's detected that a previously remembered update has been accepted, remove it from confmem.
svn path=/main/trunk/; revision=4453
-rw-r--r--pym/portage.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py
index aa7fb7c90..cab4fdcae 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6316,6 +6316,10 @@ class dblink:
if moveme:
# Merging a new file, so update confmem.
cfgfiledict[myrealdest] = [mymd5]
+ elif destmd5 == cfgfiledict.get(myrealdest, [None])[0]:
+ """A previously remembered update has been
+ accepted, so it is removed from confmem."""
+ del cfgfiledict[myrealdest]
if cfgprot:
mydest = new_protect_filename(mydest, newmd5=mymd5)