diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2011-09-09 16:31:11 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2011-09-09 16:32:31 +0300 |
| commit | a5a7021658212748e9f787ce23181d3e099aba73 (patch) | |
| tree | 459384995fc52f096007c3ed4d8d88ca865f998c /src/database.c | |
| parent | 0e24207c2e4fedb9c0656ed98bc37cd37df44d91 (diff) | |
| download | apk-tools-a5a7021658212748e9f787ce23181d3e099aba73.tar.gz apk-tools-a5a7021658212748e9f787ce23181d3e099aba73.tar.bz2 apk-tools-a5a7021658212748e9f787ce23181d3e099aba73.tar.xz apk-tools-a5a7021658212748e9f787ce23181d3e099aba73.zip | |
applets: start using solver code
still todo:
- 'fix' is missing
- 'del -R' does not work
- 'upgrade' does not do self-upgrade first
... and a lot of testing.
Diffstat (limited to 'src/database.c')
| -rw-r--r-- | src/database.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/database.c b/src/database.c index ade8a90..664d235 100644 --- a/src/database.c +++ b/src/database.c @@ -29,7 +29,6 @@ #include "apk_defines.h" #include "apk_package.h" #include "apk_database.h" -#include "apk_state.h" #include "apk_applet.h" #include "apk_archive.h" #include "apk_print.h" @@ -207,7 +206,6 @@ struct apk_name *apk_db_get_name(struct apk_database *db, apk_blob_t name) return NULL; pn->name = apk_blob_cstr(name); - pn->id = db->name_id++; apk_package_array_init(&pn->pkgs); apk_name_array_init(&pn->rdepends); apk_name_array_init(&pn->rinstall_if); @@ -885,7 +883,7 @@ static int apk_db_read_state(struct apk_database *db, int flags) struct apk_istream *is; struct apk_bstream *bs; apk_blob_t blob; - int i, r; + int r; /* Read: * 1. installed repository @@ -901,9 +899,6 @@ static int apk_db_read_state(struct apk_database *db, int flags) return -ENOENT; apk_deps_parse(db, &db->world, blob); free(blob.ptr); - - for (i = 0; i < db->world->num; i++) - db->world->item[i].name->flags |= APK_NAME_TOPLEVEL; } if (!(flags & APK_OPENF_NO_INSTALLED)) { |