diff options
| author | Andrew Morrow <acm@mongodb.com> | 2014-09-08 18:24:51 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2014-09-09 15:33:04 -0400 |
| commit | 13a652f0186d8aad3db620bd2e381d646e5c79a8 (patch) | |
| tree | 315ef2fb80849234c3dcbf9566ebff113bb0105f /site_scons | |
| parent | 69f202039823933c34ad444dd9d0cac5a66095b0 (diff) | |
| download | mongo-13a652f0186d8aad3db620bd2e381d646e5c79a8.tar.gz | |
SERVER-15190 Report detected libdeps cycles
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/libdeps.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/site_scons/libdeps.py b/site_scons/libdeps.py index e17a4fa0f55..971bd0d004b 100644 --- a/site_scons/libdeps.py +++ b/site_scons/libdeps.py @@ -78,7 +78,7 @@ class DependencyCycleError(SCons.Errors.UserError): self.cycle_nodes = [first_node] def __str__(self): - return " => ".join(str(n) for n in self.cycle_nodes) + return "Library dependency cycle detected: " + " => ".join(str(n) for n in self.cycle_nodes) def __get_libdeps(node): """Given a SCons Node, return its library dependencies. @@ -111,8 +111,8 @@ def __compute_libdeps(node): except DependencyCycleError, e: if len(e.cycle_nodes) == 1 or e.cycle_nodes[0] != e.cycle_nodes[-1]: - e.cycle_nodes.append(node) - raise + e.cycle_nodes.insert(0, node) + raise finally: node.attributes.libdeps_exploring = False |