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

state: fix generation of change-set to honour dependencies

cute-signatures
Timo Teras 2009-01-13 15:21:20 +02:00
parent 3755e1cde3
commit c831ead63c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/state.c
View File

@ -253,13 +253,17 @@ int apk_state_satisfy_name(struct apk_state *state,
}
apk_state_set(state, preferred->id, APK_STATE_INSTALL);
r = apk_state_satisfy_deps(state, preferred->depends);
if (r != 0)
return r;
if (preferred != installed) {
r = apk_state_add_change(state, installed, preferred);
if (r != 0)
return r;
}
return apk_state_satisfy_deps(state, preferred->depends);
return 0;
}
int apk_state_satisfy_deps(struct apk_state *state,
@ -271,7 +275,7 @@ int apk_state_satisfy_deps(struct apk_state *state,
if (deps == NULL)
return 0;
for (i = 0; i < deps->num; i++) {
for (i = deps->num - 1; i >= 0; i--) {
name = deps->item[i].name;
if (name->pkgs == NULL) {
apk_error("No providers for '%s'", name->name);