diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-01-16 12:56:20 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-01-16 12:56:20 +0000 |
| commit | 500778f45e72ab66d9a8a5428ef06544303e3d17 (patch) | |
| tree | d1a29e7663a4ad4da48523952b6ed210b7ad8588 /src/state.c | |
| parent | e97521470445bfd076573623379366d40f228ed3 (diff) | |
| parent | 6b6c10cdf244d3a307df4c339cde774600d49f49 (diff) | |
| download | apk-tools-500778f45e72ab66d9a8a5428ef06544303e3d17.tar.gz apk-tools-500778f45e72ab66d9a8a5428ef06544303e3d17.tar.bz2 apk-tools-500778f45e72ab66d9a8a5428ef06544303e3d17.tar.xz apk-tools-500778f45e72ab66d9a8a5428ef06544303e3d17.zip | |
Merge branch 'master' of ssh://dev.alpinelinux.org/gitroot/apk-tools
Diffstat (limited to 'src/state.c')
| -rw-r--r-- | src/state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/state.c b/src/state.c index 3b93fc1..a6aaf7f 100644 --- a/src/state.c +++ b/src/state.c @@ -205,7 +205,7 @@ int apk_state_satisfy_name(struct apk_state *state, struct apk_name *name) { struct apk_package *preferred = NULL, *installed = NULL; - int i, r, upgrading = 1; + int i, r; /* Is something already installed? Or figure out the preferred * package. */ @@ -216,9 +216,9 @@ int apk_state_satisfy_name(struct apk_state *state, if (apk_pkg_get_state(name->pkgs->item[i]) == APK_STATE_INSTALL) { installed = name->pkgs->item[i]; - if (!upgrading) { + if (!apk_upgrade) { preferred = installed; - continue; + break; } } |