usrmove breaks on directory name conflict

[Daniel Drake]

Hi,

Last week I tried a preupgrade from F16 to F17 beta.

When rebooting into the preupgrade environment, the upgrade failed in usrmove:

Make a copy of /mnt/sysimage/usr/bin
Merge the copy with /mnt/sysimage/bin
cp: cannot overwrite directory /mnt/sysimage/usr/bin.usrmove-new/mkdir
with non-directory
Something failed. Move back to the original state.


Rebooted back into F16. It looks like the issue was that I had a
directory at "/usr/bin/mkdir/". No idea how, looks like it was from
December. Probably my fault, but perhaps usrmove shouldn't fall over
when facing this situation.

After removing that weird directory, I rebooted into preupgrade and it
worked fine. Now running F17 beta.

Thanks,
Daniel