From d8ba07e484b0c838ce475202f03e041953b183e1 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Mon, 3 Jan 2011 21:06:41 +0200 Subject: pkg, db: allow index with unsupported features to be loaded Just disable installation of packages using the new stuff. Also flag lower case package info fields as non-critical and allow installation even if that features is not supported. --- src/database.c | 51 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) (limited to 'src/database.c') diff --git a/src/database.c b/src/database.c index f87123b..d7692cd 100644 --- a/src/database.c +++ b/src/database.c @@ -562,7 +562,7 @@ int apk_db_index_read(struct apk_database *db, struct apk_bstream *bs, int repo) struct hlist_node **diri_node = NULL; struct hlist_node **file_diri_node = NULL; apk_blob_t token = APK_BLOB_STR("\n"), l; - int field; + int field, r; while (!APK_BLOB_IS_NULL(l = bs->read(bs, token))) { if (l.len < 2 || l.ptr[1] != ':') { @@ -589,27 +589,25 @@ int apk_db_index_read(struct apk_database *db, struct apk_bstream *bs, int repo) /* If no package, create new */ if (pkg == NULL) { pkg = apk_pkg_new(); - ipkg = NULL; + ipkg = NULL; diri = NULL; file_diri_node = NULL; } /* Standard index line? */ - if (apk_pkg_add_info(db, pkg, field, l) == 0) { - if (repo == -1 && field == 'S') { - /* Instert to installed database; this needs to - * happen after package name has been read, but - * before first FDB entry. */ - ipkg = apk_pkg_install(db, pkg); - diri_node = hlist_tail_ptr(&ipkg->owned_dirs); - } + r = apk_pkg_add_info(db, pkg, field, l); + if (r == 0) { + if (repo == -1 && field == 'S') { + /* Instert to installed database; this needs to + * happen after package name has been read, but + * before first FDB entry. */ + ipkg = apk_pkg_install(db, pkg); + diri_node = hlist_tail_ptr(&ipkg->owned_dirs); + } continue; - } - - if (repo != -1 || ipkg == NULL) { - apk_error("Invalid index entry '%c'", field); - return -1; } + if (repo != -1 || ipkg == NULL) + continue; /* Check FDB special entries */ switch (field) { @@ -647,8 +645,14 @@ int apk_db_index_read(struct apk_database *db, struct apk_bstream *bs, int repo) apk_blob_pull_csum(&l, &file->csum); break; default: - apk_error("FDB entry '%c' unsupported", field); - return -1; + if (r != 0 && !(apk_flags & APK_FORCE)) { + /* Installed db should not have unsupported fields */ + apk_error("This apk-tools is too old to handle installed packages"); + return -1; + } + /* Installed. So mark the package as installable. */ + pkg->filename = NULL; + continue; } if (APK_BLOB_IS_NULL(l)) { apk_error("FDB format error in entry '%c'", field); @@ -879,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; + int i, r; /* Read: * 1. installed repository @@ -903,8 +907,10 @@ static int apk_db_read_state(struct apk_database *db, int flags) if (!(flags & APK_OPENF_NO_INSTALLED)) { bs = apk_bstream_from_file(db->root_fd, "var/lib/apk/installed"); if (bs != NULL) { - apk_db_index_read(db, bs, -1); + r = apk_db_index_read(db, bs, -1); bs->close(bs, NULL); + if (r != 0) + return -1; } bs = apk_bstream_from_file(db->root_fd, "var/lib/apk/triggers"); @@ -1182,6 +1188,13 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) goto ret_r; } + if (db->compat_newfeatures) { + apk_warning("This apk-tools is OLD! Some packages %s.", + db->compat_notinstallable ? + "are not installable" : + "might not function properly"); + } + return rr; ret_errno: -- cgit v1.2.3-70-g09d2