diff options
author | André Erdmann <dywi@mailerd.de> | 2013-08-27 17:32:48 +0200 |
---|---|---|
committer | André Erdmann <dywi@mailerd.de> | 2013-08-27 17:32:48 +0200 |
commit | a97a5b84ea7f9f1a215e04af44e65092c2f3ee6d (patch) | |
tree | 438153de50a1790df533b62f40438c9c51b0cf13 /roverlay/depres | |
parent | fix deptype.PKG, deptype.SYS (diff) | |
download | R_overlay-a97a5b84ea7f9f1a215e04af44e65092c2f3ee6d.tar.gz R_overlay-a97a5b84ea7f9f1a215e04af44e65092c2f3ee6d.tar.bz2 R_overlay-a97a5b84ea7f9f1a215e04af44e65092c2f3ee6d.zip |
depres unresolvable listener: log deptype
Diffstat (limited to 'roverlay/depres')
-rw-r--r-- | roverlay/depres/listeners.py | 23 |
1 files 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 (...) --- |