The if structure in CheckReread is broken, and makes partitions reread
be full of race issues (esp. after updating them).

Also fix a small message bug.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>