From af585d036182ddf2962c0aebc9b231c48346b804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Fri, 20 Nov 2015 20:54:34 +0100
Subject: [PATCH] pkgman search: Add --requirements option

---
 headers/os/package/solver/Solver.h        |  1 +
 src/bin/pkgman/command_search.cpp         | 22 ++++++++++++++++------
 src/kits/package/solver/LibsolvSolver.cpp |  9 +++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/headers/os/package/solver/Solver.h b/headers/os/package/solver/Solver.h
index 068e4c5e39..5cce3a5f38 100644
--- a/headers/os/package/solver/Solver.h
+++ b/headers/os/package/solver/Solver.h
@@ -32,6 +32,7 @@ public:
 				B_FIND_IN_DESCRIPTION		= 0x08,
 				B_FIND_IN_PROVIDES			= 0x10,
 				B_FIND_INSTALLED_ONLY		= 0x20,
+				B_FIND_IN_REQUIRES			= 0x40,
 			};
 
 			// VerifyInstallation() flags
diff --git a/src/bin/pkgman/command_search.cpp b/src/bin/pkgman/command_search.cpp
index 43bb25c93f..5d07da9677 100644
--- a/src/bin/pkgman/command_search.cpp
+++ b/src/bin/pkgman/command_search.cpp
@@ -53,6 +53,8 @@ static const char* const kLongUsage =
 	"    Only find installed packages.\n"
 	"  -u, --uninstalled-only\n"
 	"    Only find not installed packages.\n"
+	"  -r, --requirements\n"
+	"    Search packages with <search-string> as requirements.\n"
 	"\n"
 	"Status flags in non-detailed listings:\n"
 	"  S - installed in system with a matching version in a repository\n"
@@ -132,6 +134,7 @@ SearchCommand::Execute(int argc, const char* const* argv)
 	bool uninstalledOnly = false;
 	bool listAll = false;
 	bool details = false;
+	bool requirements = false;
 
 	while (true) {
 		static struct option sLongOptions[] = {
@@ -141,11 +144,12 @@ SearchCommand::Execute(int argc, const char* const* argv)
 			{ "help", no_argument, 0, 'h' },
 			{ "installed-only", no_argument, 0, 'i' },
 			{ "uninstalled-only", no_argument, 0, 'u' },
+			{ "requirements", no_argument, 0, 'r' },
 			{ 0, 0, 0, 0 }
 		};
 
 		opterr = 0; // don't print errors
-		int c = getopt_long(argc, (char**)argv, "aDhiu", sLongOptions, NULL);
+		int c = getopt_long(argc, (char**)argv, "aDhiur", sLongOptions, NULL);
 		if (c == -1)
 			break;
 
@@ -175,6 +179,10 @@ SearchCommand::Execute(int argc, const char* const* argv)
 				installedOnly = false;
 				break;
 
+			case 'r':
+				requirements = true;
+				break;
+
 			default:
 				PrintUsageAndExit(true);
 				break;
@@ -183,7 +191,7 @@ SearchCommand::Execute(int argc, const char* const* argv)
 
 	// The remaining argument is the search string. Ignored when --all has been
 	// specified.
-	if (!listAll && argc != optind + 1)
+	if ((!listAll && argc != optind + 1) || (listAll && requirements))
 		PrintUsageAndExit(true);
 
 	const char* searchString = listAll ? "" : argv[optind++];
@@ -195,13 +203,15 @@ SearchCommand::Execute(int argc, const char* const* argv)
 		(!uninstalledOnly ? PackageManager::B_ADD_INSTALLED_REPOSITORIES : 0)
 			| (!installedOnly ? PackageManager::B_ADD_REMOTE_REPOSITORIES : 0));
 
+	uint32 flags = BSolver::B_FIND_CASE_INSENSITIVE | BSolver::B_FIND_IN_NAME
+		| BSolver::B_FIND_IN_SUMMARY | BSolver::B_FIND_IN_DESCRIPTION
+		| BSolver::B_FIND_IN_PROVIDES;
+	if (requirements)
+		flags = BSolver::B_FIND_IN_REQUIRES;
 	// search
 	BObjectList<BSolverPackage> packages;
 	status_t error = packageManager.Solver()->FindPackages(searchString,
-		BSolver::B_FIND_CASE_INSENSITIVE | BSolver::B_FIND_IN_NAME
-			| BSolver::B_FIND_IN_SUMMARY | BSolver::B_FIND_IN_DESCRIPTION
-			| BSolver::B_FIND_IN_PROVIDES,
-		packages);
+		flags, packages);
 	if (error != B_OK)
 		DIE(error, "searching packages failed");
 
diff --git a/src/kits/package/solver/LibsolvSolver.cpp b/src/kits/package/solver/LibsolvSolver.cpp
index d0e2373b00..c8bd167395 100644
--- a/src/kits/package/solver/LibsolvSolver.cpp
+++ b/src/kits/package/solver/LibsolvSolver.cpp
@@ -292,6 +292,15 @@ LibsolvSolver::FindPackages(const char* searchString, uint32 flags,
 			queue_push2(&selection, SOLVER_SOLVABLE, iterator.solvid);
 	}
 
+	// search package requires
+	if ((flags & B_FIND_IN_REQUIRES) != 0) {
+		dataiterator_set_keyname(&iterator, SOLVABLE_REQUIRES);
+		dataiterator_set_search(&iterator, 0, 0);
+
+		while (dataiterator_step(&iterator))
+			queue_push2(&selection, SOLVER_SOLVABLE, iterator.solvid);
+	}
+
 	return _GetFoundPackages(selection, flags, _packages);
 }