[MERGE] cleanup progress properly when interrupted during fetch (#54000)

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:

> So with some sort of fix that doesn't catch AssertionError, +1 from me.

Done.  Thanks.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFGCD70F+nu1YWqI0RAtCWAJwKDSinaeEUAVh4TX2smczfecaCTgCfUotk
ks1V85/m1MHkn8ldZ5mJfo0=
=ke2W
-----END PGP SIGNATURE-----