Revision a2e90275 Ganeti/HTools/Cluster.hs

b/Ganeti/HTools/Cluster.hs
619 619
-- | Inner function for splitJobs, that either appends the next job to
620 620
-- the current jobset, or starts a new jobset.
621 621
mergeJobs :: ([JobSet], [Ndx]) -> MoveJob -> ([JobSet], [Ndx])
622
mergeJobs ([], _) n@(ndx, _) = ([[n]], ndx)
623
mergeJobs (cjs@(j:js), nbuf) n@(ndx, _)
622
mergeJobs ([], _) n@(ndx, _, _) = ([[n]], ndx)
623
mergeJobs (cjs@(j:js), nbuf) n@(ndx, _, _)
624 624
    | null (ndx `intersect` nbuf) = ((n:j):js, ndx ++ nbuf)
625 625
    | otherwise = ([n]:cjs, ndx)
626 626

  
......
632 632
-- | Given a list of commands, prefix them with @gnt-instance@ and
633 633
-- also beautify the display a little.
634 634
formatJob :: Int -> Int -> (Int, MoveJob) -> [String]
635
formatJob jsn jsl (sn, (_, cmds)) =
635
formatJob jsn jsl (sn, (_, _, cmds)) =
636 636
    let out =
637 637
            printf "  echo job %d/%d" jsn sn:
638 638
            printf "  check":

Also available in: Unified diff