Minor refactor in pkgmgr_upgrade.c