[gentoo-commits] proj/R_overlay:master commit in: roverlay/db/

["André Erdmann" <dywi@mailerd.de>]

commit:     35d3fa6d99e964cddb256813ef786c66becdbe61
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Sep  5 12:47:39 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Sep  5 12:47:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=35d3fa6d

distmap: use exactly one virtual entry

use one virtual entry for all distfiles that do not exist

---
 roverlay/db/distmap.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/roverlay/db/distmap.py b/roverlay/db/distmap.py
index 66ed838..0a3ee64 100644
--- a/roverlay/db/distmap.py
+++ b/roverlay/db/distmap.py
@@ -44,16 +44,6 @@ class DistMapInfo ( object ):
       return instance.make_volatile ( p_info, backref=backref )
    # --- end of volatile_from_package_info (...) ---
 
-   @classmethod
-   def volatile_from_distfile ( cls, distfile, backref=None ):
-      # COULDFIX
-      #  a static instance should suffice for this entry "type"
-      instance = cls ( distfile, None, None, None, volatile=True )
-      if backref is not None:
-         instance.add_backref ( backref )
-      return instance
-   # --- end of volatile_from_distfile (...) ---
-
    def __init__ (
       self, distfile, repo_name, repo_file, sha256, volatile=None
    ):
@@ -196,6 +186,8 @@ class _DistMapBase ( roverlay.util.objects.PersistentContent ):
 
       self.stats    = roverlay.stats.collector.static.distmap
 
+      self._VIRTUAL_ENTRY = None
+
       self._rebind_distmap()
 
       self.update_only = True
@@ -504,16 +496,22 @@ class _DistMapBase ( roverlay.util.objects.PersistentContent ):
       """
       if self.update_only:
          entry = self._distmap.get ( distfile, None )
-         if entry is None or entry != distmap_info:
+
+         if entry is not None and entry == distmap_info:
+            return entry
+
+         else:
             self._distmap [distfile] = distmap_info
             if distmap_info.is_persistent():
                self._file_added ( distfile )
             del entry
+
       else:
          self._distmap [distfile] = distmap_info
          if distmap_info.is_persistent():
             self._file_added ( distfile )
 
+
       return distmap_info
    # --- end of add_entry (...) ---
 
@@ -601,11 +599,15 @@ class _DistMapBase ( roverlay.util.objects.PersistentContent ):
             self.logger.log ( log_level, log_msg )
       # -- end if <log_level>
 
-      return self.add_entry (
-         distfile, DistMapInfo.volatile_from_distfile (
-            distfile, backref=backref
+      if self._VIRTUAL_ENTRY is None:
+         self._VIRTUAL_ENTRY = DistMapInfo (
+            None, None, None, None, volatile=True
          )
-      )
+
+      if backref is not None:
+         self._VIRTUAL_ENTRY.add_backref ( backref )
+
+      return self.add_entry ( distfile, self._VIRTUAL_ENTRY )
    # --- end of add_virtual_entry (...) ---
 
 # --- end of _DistMapBase ---