From 5ea81ca564534e4ef5eefbe723a74dbf490e6e07 Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Fri, 28 Nov 2008 13:34:40 +0200 Subject: add: add support to install packages not in a repository --- src/add.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'src/add.c') diff --git a/src/add.c b/src/add.c index b20d16f..562ce26 100644 --- a/src/add.c +++ b/src/add.c @@ -22,14 +22,32 @@ static int add_main(int argc, char **argv) return -1; for (i = 0; i < argc; i++) { - struct apk_dependency dep = { - .name = apk_db_get_name(&db, APK_BLOB_STR(argv[i])), - }; + struct apk_dependency dep; + + if (strstr(argv[i], ".apk") != NULL) { + struct apk_package *pkg; + + pkg = apk_db_pkg_add_file(&db, argv[i]); + if (pkg == NULL) { + apk_error("Unable to read '%s'", argv[i]); + goto err; + } + + dep = (struct apk_dependency) { + .name = pkg->name, + .version_mask = APK_VERSION_RESULT_MASK(APK_VERSION_EQUAL), + .version = pkg->version, + }; + } else { + dep = (struct apk_dependency) { + .name = apk_db_get_name(&db, APK_BLOB_STR(argv[i])), + }; + } apk_deps_add(&db.world, &dep); } apk_db_recalculate_and_commit(&db); +err: apk_db_close(&db); - return 0; } -- cgit v1.2.3