[gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/, roverlay/depres/

[André Erdmann]

commit:     bc06adb9f7fc906c5ee11ad9dfa636255a37266d
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Sep  2 13:15:51 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Sep  2 13:15:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=bc06adb9

depres, dep env: provide a ref to the package info

DepEnv objects can now (optionally) contain a reference to "their" PackageInfo
object. This allows the dynamic selfdep pool to decide which rules to try (and
in which order) based on the package being processed.
(I've chosen a (weak) reference because DepEnv objects should not keep
PackageInfos in memory.)

The actual PackageInfo can then be accessed via <DepEnv>.get_package_info().

---
 roverlay/depres/channels.py |  4 +++-
 roverlay/depres/depenv.py   | 25 ++++++++++++++++++++++---
 roverlay/ebuild/creation.py | 10 +++++++++-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/roverlay/depres/channels.py b/roverlay/depres/channels.py
index ed51df4..30eed5b 100644
--- a/roverlay/depres/channels.py
+++ b/roverlay/depres/channels.py
@@ -32,7 +32,7 @@ class _EbuildJobChannelBase ( DependencyResolverChannel ):
      add deps, then satisfy_request(): collect/lookup
    """
 
-   def __init__ ( self, err_queue, name=None, logger=None ):
+   def __init__ ( self, err_queue, name=None, logger=None, package_ref=None ):
       """EbuildJobChannel
 
       arguments:
@@ -41,6 +41,8 @@ class _EbuildJobChannelBase ( DependencyResolverChannel ):
       """
       super ( _EbuildJobChannelBase, self ) . __init__ ( main_resolver=None )
 
+      self.package_ref = package_ref
+
       # this is the number of resolved deps so far,
       # should only be modified in the join()-method
       self._depdone = 0

diff --git a/roverlay/depres/depenv.py b/roverlay/depres/depenv.py
index c8fea7e..2e6417e 100644
--- a/roverlay/depres/depenv.py
+++ b/roverlay/depres/depenv.py
@@ -132,13 +132,14 @@ class DepEnv ( object ):
    STATUS_UNRESOLVABLE = 4
 
    @classmethod
-   def from_str ( cls, dep_str, deptype_mask ):
+   def from_str ( cls, dep_str, deptype_mask, package_ref=None ):
       """Generator that (pre-)parses a dependency string and creates
       DepEnv objects for it.
 
       arguments:
       * dep_str      --
       * deptype_mask --
+      * package_ref  --
       """
       # split dep_str into logically ANDed dependency strings,
       # unquote them, remove "from <uri>.." entries and replace all
@@ -153,22 +154,32 @@ class DepEnv ( object ):
                ).strip()
             ),
             deptype_mask = deptype_mask,
+            package_ref  = package_ref,
          )
    # --- end of from_str (...) ---
 
-   def __init__ ( self, dep_str, deptype_mask ):
+   def __init__ ( self, dep_str, deptype_mask, package_ref=None ):
       """Initializes a dependency environment that represents the dependency
       resolution of one entry in the description data of an R package.
       Precalculating most (if not all) data since this object will be passed
       through many dep rules.
 
       arguments:
-      * dep_str -- dependency string at it appears in the description data.
+      * dep_str    -- dependency string at it appears in the description data.
+      * deptype_mask --
+      * package_ref  --
       """
       self.deptype_mask = deptype_mask
       self.status       = DepEnv.STATUS_UNDONE
       self.resolved_by  = None
 
+      self.package_ref  = package_ref
+      if package_ref is not None:
+         self.get_package_info = self._deref_package_info
+      else:
+         self.get_package_info = self._deref_none
+
+
       self.dep_str      = dep_str
       self.dep_str_low  = dep_str.lower()
 
@@ -180,6 +191,14 @@ class DepEnv ( object ):
 
    # --- end of __init__ (...) ---
 
+   def _deref_none ( self ):
+      return None
+   # --- end of _deref_none (...) ---
+
+   def _deref_package_info ( self ):
+      return self.package_ref.deref_safe()
+   # --- end of _deref_package_info (...) ---
+
    def _depsplit ( self ):
       result = list()
       for r in self.__class__.VERSION_REGEX:

diff --git a/roverlay/ebuild/creation.py b/roverlay/ebuild/creation.py
index a2a021d..fafd099 100644
--- a/roverlay/ebuild/creation.py
+++ b/roverlay/ebuild/creation.py
@@ -12,6 +12,8 @@ easy-to-use ebuild creation access.
 
 __all__ = [ 'EbuildCreation', ]
 
+#TODO/COULDFIX: merge creation.py and depres.py
+
 import logging
 
 from roverlay.ebuild import depres, ebuilder, evars
@@ -53,6 +55,12 @@ class EbuildCreation ( object ):
       #self.use_expand_flag_names = None
    # --- end of __init__ (...) ---
 
+   def _get_depres_channel ( self, **channel_kw ):
+      return self.depres_channel_spawner (
+         package_ref=self.package_info.get_ref(), **channel_kw
+      )
+   # --- end of _get_depres_channel (...) ---
+
    def done    ( self ) : return self.status  < 1
    def busy    ( self ) : return self.status  > 0
    def success ( self ) : return self.status == 0
@@ -120,7 +128,7 @@ class EbuildCreation ( object ):
          # resolve dependencies
          dep_resolution = depres.EbuildDepRes (
             self.package_info, self.logger,
-            run_now=True, depres_channel_spawner=self.depres_channel_spawner,
+            run_now=True, depres_channel_spawner=self._get_depres_channel,
             err_queue=self.err_queue
          )
          if dep_resolution.success():