[dbc@hopper rmake]$ hg diff build/dephandler.py diff -r d1d86595d58a rmake/build/dephandler.py --- a/rmake/build/dephandler.py Tue Jun 19 12:32:03 2007 -0400 +++ b/rmake/build/dephandler.py Mon Jun 25 13:57:49 2007 -0400 @@ -513,7 +513,7 @@ class DependencyHandler(object): changed = True while changed: changed = False - for (fromTrove,toTrove), steps in map.items(): + for (fromTrove,toTrove), steps in sorted(map.items()): for child in depGraph.iterChildren(toTrove): if child == fromTrove: steps = [fromTrove] + steps + [toTrove, fromTrove] [dbc@hopper test]$ cd buildtest/ [dbc@hopper buildtest]$ hg diff dephandlertest.py diff -r 66bb01ab7a7d test/buildtest/dephandlertest.py --- a/test/buildtest/dephandlertest.py Tue Jun 19 16:26:53 2007 -0400 +++ b/test/buildtest/dephandlertest.py Mon Jun 25 13:59:14 2007 -0400 @@ -357,9 +357,9 @@ class DepHandlerTest(rephelp.RepositoryH foo:source=/localhost@rpl:linux/2-1[]{}''' in wrapper.logs) assert('''\ + Cycle 1: Shortest Cycles: - foo:source=/localhost@rpl:linux/2-1[]{} + bar:source=/localhost@rpl:linux/2-1[]{} + -> foo:source=/localhost@rpl:linux/2-1[]{} -> bar:source=/localhost@rpl:linux/2-1[]{} - -> foo:source=/localhost@rpl:linux/2-1[]{} baz:source=/localhost@rpl:linux/2-1[]{} -> foo:source=/localhost@rpl:linux/2-1[]{}