When it's detected that a previously remembered update has been accepted, remove...
authorZac Medico <zmedico@gentoo.org>
Fri, 15 Sep 2006 10:49:57 +0000 (10:49 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 15 Sep 2006 10:49:57 +0000 (10:49 -0000)
svn path=/main/trunk/; revision=4453

pym/portage.py

index aa7fb7c909afbedd1e677e8036beba20f223fcd4..cab4fdcae56e3769aa50ad5fb141a838f3d89b73 100644 (file)
@@ -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)