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

[André Erdmann]

commit:     a97a5b84ea7f9f1a215e04af44e65092c2f3ee6d
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Aug 27 15:32:48 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Aug 27 15:32:48 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=a97a5b84

depres unresolvable listener: log deptype

---
 roverlay/depres/listeners.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/roverlay/depres/listeners.py b/roverlay/depres/listeners.py
index 0bfb96c..7058bfe 100644
--- a/roverlay/depres/listeners.py
+++ b/roverlay/depres/listeners.py
@@ -18,6 +18,20 @@ from roverlay.depres               import events
 from roverlay.depres.depenv        import DepEnv
 from roverlay.depres.communication import DependencyResolverListener
 
+
+def get_resolved_str ( dep_env ):
+   return "{dep_str!r} as {dep!r}".format (
+      dep_str=dep_env.dep_str, dep=dep_env.resolved_by.dep
+   )
+# --- end of get_resolved_str (...) ---
+
+def get_unresolved_str ( dep_env ):
+   return "0x{dep_type:x}, {dep_str}".format (
+      dep_type=dep_env.deptype_mask, dep_str=dep_env.dep_str
+   )
+# --- end of get_unresolved_str (...) ---
+
+
 class FileListener ( DependencyResolverListener ):
    """A dependency resolution listener that writes events to a file."""
 
@@ -111,10 +125,7 @@ class ResolvedFileListener ( FileListener ):
    # --- end of __init__ (...) ---
 
    def notify ( self, event_type, dep_env=None, pkg_env=None, **extra ):
-      self._event ( event_type,
-         "{dep_str!r} as {dep!r}".format (
-            dep_str=dep_env.dep_str, dep=dep_env.resolved_by.dep
-      ) )
+      self._event ( event_type, get_resolved_str ( dep_env ) )
    # --- end of notify (...) ---
 
 
@@ -127,7 +138,7 @@ class UnresolvableFileListener ( FileListener ):
    # --- end of __init__ (...) ---
 
    def notify ( self, event_type, dep_env=None, pkg_env=None, **extra ):
-      self._event ( event_type, dep_env.dep_str )
+      self._event ( event_type, get_unresolved_str ( dep_env ) )
    # --- end of notify (...) ---
 
 
@@ -141,5 +152,5 @@ class UnresolvableSetFileListener ( SetFileListener ):
    # --- end of __init__ (...) ---
 
    def notify ( self, event_type, dep_env=None, pkg_env=None, **extra ):
-      self._event ( event_type, dep_env.dep_str )
+      self._event ( event_type, get_unresolved_str ( dep_env ) )
    # --- end of notify (...) ---