diff options
| author | Timo Teras <timo.teras@iki.fi> | 2009-06-25 11:09:40 +0300 |
|---|---|---|
| committer | Timo Teras <timo.teras@iki.fi> | 2009-06-25 11:09:40 +0300 |
| commit | 3a488564753cee51832b6824128249a99eb4613b (patch) | |
| tree | c246723a247f1ead91937b89a4eef0b047d72da2 /src/state.c | |
| parent | 4d04bd8a463262059d83f126e604914898de81e9 (diff) | |
| download | apk-tools-3a488564753cee51832b6824128249a99eb4613b.tar.bz2 apk-tools-3a488564753cee51832b6824128249a99eb4613b.tar.xz | |
upgrade: add --available option
That will make the upgrade prefer packages available in repositories.
This is good if one want's to downgrade packages by removing an experimental
repository. Or to force re-install of locally built vs. repository version
when the package version are same, but checksum is different. Fixes #51.
Diffstat (limited to 'src/state.c')
| -rw-r--r-- | src/state.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/state.c b/src/state.c index 5d0c074..44649de 100644 --- a/src/state.c +++ b/src/state.c @@ -4,7 +4,7 @@ * Copyright (C) 2008 Timo Teräs <timo.teras@iki.fi> * All rights reserved. * - * This program is free software; you can redistribute it and/or modify it + * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published * by the Free Software Foundation. See http://www.gnu.org/ for details. */ @@ -232,8 +232,25 @@ int apk_state_lock_dependency(struct apk_state *state, if (apk_pkg_get_state(c->pkgs[i]) == APK_PKG_INSTALLED) installed = pkg; - if (latest == NULL || - apk_pkg_version_compare(pkg, latest) == APK_VERSION_GREATER) + if (latest == NULL) { + latest = pkg; + continue; + } + + if (apk_flags & APK_PREFER_AVAILABLE) { + if (latest->repos != 0 && pkg->repos == 0) + continue; + + if (latest->repos == 0 && pkg->repos != 0) { + latest = pkg; + continue; + } + + /* Otherwise both are not available, or both are + * available and we just compare the versions then */ + } + + if (apk_pkg_version_compare(pkg, latest) == APK_VERSION_GREATER) latest = pkg; } |