diff options
author | André Erdmann <dywi@mailerd.de> | 2013-07-17 20:09:27 +0200 |
---|---|---|
committer | André Erdmann <dywi@mailerd.de> | 2013-07-17 20:09:27 +0200 |
commit | 87a457f712fbe30c502f098eee4b2dc961640e63 (patch) | |
tree | 23a7ae62d9647ed95d8cec3dc4dcc74dc48f3e23 /roverlay/ebuild | |
parent | add debug capabilities to depresult (diff) | |
download | R_overlay-87a457f712fbe30c502f098eee4b2dc961640e63.tar.gz R_overlay-87a457f712fbe30c502f098eee4b2dc961640e63.tar.bz2 R_overlay-87a457f712fbe30c502f098eee4b2dc961640e63.zip |
fixup
This commit fixes some issues (mostly typos).
It also adds some logging concerning selfdep validation.
Diffstat (limited to 'roverlay/ebuild')
-rw-r--r-- | roverlay/ebuild/creation.py | 16 | ||||
-rw-r--r-- | roverlay/ebuild/depres.py | 8 | ||||
-rw-r--r-- | roverlay/ebuild/evars.py | 2 |
3 files changed, 17 insertions, 9 deletions
diff --git a/roverlay/ebuild/creation.py b/roverlay/ebuild/creation.py index b2a291e..334c276 100644 --- a/roverlay/ebuild/creation.py +++ b/roverlay/ebuild/creation.py @@ -235,6 +235,22 @@ class EbuildCreation ( object ): hasattr ( self, 'selfdeps' ) or hasattr ( self, 'optional_selfdeps' ) ): self.logger.debug ( "selfdep validation failed." ) + if hasattr ( self, 'selfdeps' ): + for selfdep in self.selfdeps: + self.logger.debug ( + "selfdep {}: {}".format ( + selfdep.dep, "OK" if selfdep.is_valid() else "FAIL" + ) + ) + if hasattr ( self, 'optional_selfdeps' ): + for selfdep in self.optional_selfdeps: + self.logger.debug ( + "optional selfdep {}: {}".format ( + selfdep.dep, "OK" if selfdep.is_valid() else "FAIL" + ) + ) + + return False else: raise AssertionError ( diff --git a/roverlay/ebuild/depres.py b/roverlay/ebuild/depres.py index 81f2711..3bdbee9 100644 --- a/roverlay/ebuild/depres.py +++ b/roverlay/ebuild/depres.py @@ -177,14 +177,6 @@ class EbuildDepRes ( object ): def success ( self ) : return self.status == 0 #def fail ( self ) : return self.status < 0 - def get_result ( self ): - """Returns the result of dependency resolution, - as tuple ( <status>, <evars>, <has R suggests> ) - """ - raise NotImplementedError() - return ( self.status, self.result, self.has_suggests ) - # --- end of get_result (...) --- - def resolve ( self ): """Try to make/get dependency resolution results. Returns None.""" try: diff --git a/roverlay/ebuild/evars.py b/roverlay/ebuild/evars.py index 138fc04..f602033 100644 --- a/roverlay/ebuild/evars.py +++ b/roverlay/ebuild/evars.py @@ -132,7 +132,7 @@ class UseExpandListValue ( ) else: raise ValueError ( - "depstr {!r} cannot be parsed".format ( depstr ) + "depstr {!r} cannot be parsed".format ( dep.dep ) ) # --- end of _get_depstr_key (...) --- |