Minor cleanup: it's simpler to have separate code paths for the update
and non-update cases.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>