summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2009-04-09 07:00:17 -0700
committerDaniel Burrows <dburrows@debian.org>2009-04-09 07:00:17 -0700
commit5a418ad3420b4d29ee5175e3a31e8cd5314645ce (patch)
treeaa9a327ddf29f0274efca20ac2554f233151ca0d
parent0f3a8febf8a59463be72637176f4aa4201ba150c (diff)
downloadaptitude-5a418ad3420b4d29ee5175e3a31e8cd5314645ce.tar.gz
Treat "found solution" lines as the beginning of a step, so all the solutions are marked in the output graph.
-rw-r--r--tools/resolver-visualize/Resolver/Log.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/resolver-visualize/Resolver/Log.hs b/tools/resolver-visualize/Resolver/Log.hs
index 87b8b9c4..dde14a65 100644
--- a/tools/resolver-visualize/Resolver/Log.hs
+++ b/tools/resolver-visualize/Resolver/Log.hs
@@ -175,7 +175,7 @@ newPartialStep sol startPos =
compile :: String -> Regex
compile = makeRegex
-processingStepStart = compile "Processing (step [0-9]*: )?(.*)$"
+processingStepStart = compile "(Processing (step [0-9]*: )?|--- Found solution )(.*)$"
newPromotion = compile "Inserting new promotion: (.*)$"
-- Note: if we see a "forced" dependency and no "generated" line, we
-- magically know that the next "Processing" line will be for its
@@ -493,7 +493,7 @@ addSuccessor succInf@(s, _, _) filename lineNum lastStep =
-- processingStepStart.
processStepStartLine :: ByteString -> MatchArray -> LogParse ()
processStepStartLine source matches =
- do sol <- parseMatch solution source (matches!2)
+ do sol <- parseMatch solution source (matches!3)
loc <- getCurrentLineStart
-- If the solution is empty, assume we're starting a new run.
when (Map.null $ solChoices sol) (startNewRun loc)