test: improve loading of repositories, fix broken install-if test

1 files changed, 15 insertions, 3 deletions

diff --git a/src/apk.c b/src/apk.c
index daf4d7f..970bbb1 100644
--- a/src/apk.c
+++ b/src/apk.c
@@ -513,6 +513,13 @@ int main(int argc, char **argv)
 		apk_blob_t spec = APK_BLOB_STR(test_repos->item[i]), name, tag;
 		int repo_tag = 0, repo = APK_REPOSITORY_FIRST_CONFIGURED + i;
 
+		if (spec.ptr[0] == '!') {
+			/* cache's installed repository */
+			spec.ptr++;
+			spec.len--;
+			repo = -2;
+		}
+
 		if (apk_blob_split(spec, APK_BLOB_STR(":"), &tag, &name)) {
 			repo_tag = apk_db_get_tag_id(&db, tag);
 		} else {
@@ -520,9 +527,14 @@ int main(int argc, char **argv)
 		}
 
 		bs = apk_bstream_from_file(AT_FDCWD, name.ptr);
-		if (bs != NULL) {
-			apk_db_index_read(&db, bs, repo);
-			bs->close(bs, NULL);
+		if (bs == NULL) {
+			apk_error("Failed to open repository: " BLOB_FMT, BLOB_PRINTF(name));
+			goto err;
+		}
+
+		apk_db_index_read(&db, bs, repo);
+		bs->close(bs, NULL);
+		if (repo != -2) {
 			if (!(apk_flags & APK_NO_NETWORK))
 				db.available_repos |= BIT(repo);
 			db.repo_tags[repo_tag].allowed_repos |= BIT(repo);