From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 16 Feb 2017 15:36:58 +0000 (+0100)
Subject: libopkg: selectively load package feeds in opkg_info_status_cmd()
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=commitdiff_plain;h=571501b23bff8bdfb580d1e811141ef76ee7682d

libopkg: selectively load package feeds in opkg_info_status_cmd()

Use the new pkg_hash_load_package_details() helper to selectively load the
dependency subgraphs of the to be installed packages.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index 8fc846a..f9d5192 100644
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -435,14 +435,6 @@ static int opkg_install_cmd(int argc, char **argv)
 	char *arg;
 	int err = 0;
 
-	if (conf->force_reinstall) {
-		int saved_force_depends = conf->force_depends;
-		conf->force_depends = 1;
-		(void)opkg_remove_cmd(argc, argv);
-		conf->force_depends = saved_force_depends;
-		conf->force_reinstall = 0;
-	}
-
 	signal(SIGINT, sigint_handler);
 
 	/*
@@ -455,6 +447,18 @@ static int opkg_install_cmd(int argc, char **argv)
 		if (opkg_prepare_url_for_install(arg, &argv[i]))
 			return -1;
 	}
+
+	pkg_hash_load_package_details();
+	pkg_hash_load_status_files();
+
+	if (conf->force_reinstall) {
+		int saved_force_depends = conf->force_depends;
+		conf->force_depends = 1;
+		(void)opkg_remove_cmd(argc, argv);
+		conf->force_depends = saved_force_depends;
+		conf->force_reinstall = 0;
+	}
+
 	pkg_info_preinstall_check();
 
 	for (i = 0; i < argc; i++) {