Tweak job progress reporting.

diff --git a/src/lib/job.cc b/src/lib/job.cc
index bde2c8cfd69ca47bffb84f837d17199508e454ef..bfad65a0a61f18d6566fa937b528232b91fe38f2 100644 (file)
--- 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 ()) {