[Bug 1176044] Repository mess when upgrading