jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

state: modify reinstallation prints 

To print upgrading if package is actually being changed instead of
pure reinstall.
cute-signatures
Timo Teräs 2010-05-27 16:19:14 +03:00
parent 4fde5f101a
commit 2165547bad
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/state.c
View File

@ -569,8 +569,12 @@ static void apk_print_change(struct apk_database *db,
msg = "Downgrading"; msg = "Downgrading";
break; break;
case APK_VERSION_EQUAL: case APK_VERSION_EQUAL:
msg = "Re-installing"; if (newpkg == oldpkg) {
break; msg = "Re-installing";
break;
}
/* fallthrough - equal version, but different
* package is counted as upgrade */
case APK_VERSION_GREATER: case APK_VERSION_GREATER:
msg = "Upgrading"; msg = "Upgrading";
break; break;
@ -689,19 +693,18 @@ static int cmp_downgrade(struct apk_change *change)
static int cmp_upgrade(struct apk_change *change) static int cmp_upgrade(struct apk_change *change)
{ {
int t;
if (change->newpkg == NULL || change->oldpkg == NULL) if (change->newpkg == NULL || change->oldpkg == NULL)
return 0; return 0;
t = apk_pkg_version_compare(change->newpkg, change->oldpkg);
if (t & APK_VERSION_GREATER)
return 1;
/* Count swapping package as upgrade too - this can happen if /* Count swapping package as upgrade too - this can happen if
* same package version is used after it was rebuilt against * same package version is used after it was rebuilt against
* newer libraries. Basically, different (and probably newer) * newer libraries. Basically, different (and probably newer)
* package, but equal version number. */ * package, but equal version number. */
if ((t & APK_VERSION_EQUAL) && (change->newpkg != change->oldpkg)) if ((apk_pkg_version_compare(change->newpkg, change->oldpkg) &
(APK_VERSION_GREATER | APK_VERSION_EQUAL)) &&
(change->newpkg != change->oldpkg))
return 1; return 1;
return 0; return 0;
} }