Fixing corrupted RPM database after F17 upgrade

Hi all,

I finally upgraded to F17 recently (yeah I know, but better late than never), and Preupgrade died trying to upgrade VirtualBox. I had to uninstall it and restart the upgrade. This mostly worked, but I got a message about the rpm db being updated outside the install process (which it was!).

So the problem is now that I've got fc16 and fc17 rpms listed in the database, and trying to install anything looks at the fc16 repo. Using yum --releasever=17 seems to work ok, and I think that what I actually do have installed are the fc17 packages.

So I'd like people's advice on the best way to fix the yum/rpm database. I think I can do this to make it use the fc17 repo:

yum --releasever=17 reinstall fedora-release

However given the strange state of the database I'm not sure if that's a good idea before fixing the duplicate fc16 and fc17 packages.

Would the best plan be to run rpm --initdb
Or should I try remove all the fc16 entries in the database with rpm -e --justdb?

Presumably some key step failed at the end of the upgrade, but I don't know what it was.

Advice on fixing this would be much appreciated.