When overwriting the current file with an .rpmnew/.rpmsave file, check that the copy worked before removing the source file.
Merge branch 'cp-and-rm'