From bbd352c3a0acf312e66b8be0d8bfb475275102d6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 24 Feb 2013 10:29:41 +0000 Subject: Tweak job progress reporting. --- src/lib/job.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/job.cc b/src/lib/job.cc index bde2c8cfd..bfad65a0a 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -272,10 +272,11 @@ Job::status () const } stringstream s; - if (!finished () && p >= 0 && t > 10 && r > 0) { - s << pc << "%; " << seconds_to_approximate_hms (r) << " remaining"; - } else if (!finished () && (t <= 10 || r == 0)) { + if (!finished ()) { s << pc << "%"; + if (p >= 0 && t > 10 && r > 0) { + s << "; " << seconds_to_approximate_hms (r) << " remaining"; + } } else if (finished_ok ()) { s << "OK (ran for " << seconds_to_hms (_ran_for) << ")"; } else if (finished_in_error ()) { -- cgit v1.2.3