What to do about "File X is not in either expected pre- or post-patch state for Y" errors in install.log?
I managed to fix this just now by booting into safe-mode and running software update.

To boot into safe-mode, restart your computer and hold ⇧ shift during start up.