3 files changed, 19 insertions, 38 deletions

diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c
index 2481c0b6..2feca5c4 100644
--- a/src/pacman/deptest.c
+++ b/src/pacman/deptest.c
@@ -31,53 +31,23 @@
 #include "util.h"
 #include "conf.h"
 
-/* TODO: This should use _alpm_checkdeps() */
 int pacman_deptest(alpm_list_t *targets)
 {
-	int retval = 0;
 	alpm_list_t *i;
 
-	if(targets == NULL) {
+	alpm_list_t *deps = alpm_deptest(alpm_option_get_localdb(), targets);
+	if(deps == NULL) {
 		return(0);
 	}
 
-	for(i = targets; i; i = alpm_list_next(i)) {
-		int found = 0;
-		pmpkg_t *pkg;
-		pmdepend_t *dep;
-		const char *target;
-		alpm_list_t *j, *provides;
+	for(i = deps; i; i = alpm_list_next(i)) {
+		const char *dep;
 
-		target = alpm_list_getdata(i);
-		dep = alpm_splitdep(target);
-
-		pkg = alpm_db_get_pkg(alpm_option_get_localdb(),
-				alpm_dep_get_name(dep));
-		if(pkg && alpm_depcmp(pkg, dep)) {
-			found = 1;
-		} else {
-			/* not found, can we find anything that provides this in the local DB? */
-			provides = alpm_db_whatprovides(alpm_option_get_localdb(),
-					alpm_dep_get_name(dep));
-			for(j = provides; j; j = alpm_list_next(j)) {
-				pmpkg_t *pkg;
-				pkg = alpm_list_getdata(j);
-
-				if(pkg && alpm_depcmp(pkg, dep)) {
-					found = 1;
-					break;
-				}
-			}
-			alpm_list_free(provides);
-		}
-
-		if(!found) {
-			printf("%s\n", target);
-			retval = 127;
-		}
-		free(dep);
+		dep = alpm_list_getdata(i);
+		printf("%s\n", dep);
 	}
-	return(retval);
+	alpm_list_free(deps);
+	return(127);
 }
 
 /* vim: set ts=2 sw=2 noet: */
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 27130254..61e0042a 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -79,6 +79,7 @@ static void usage(int op, const char * const myname)
 			printf("%s:  %s {-A --add} [%s] <%s>\n", str_usg, myname, str_opt, str_file);
 			printf("%s:\n", str_opt);
 			printf(_("      --asdeps         install packages as non-explicitly installed\n"));
+			printf(_("      --asexplicit     install packages as explicitly installed\n"));
 			printf(_("  -d, --nodeps         skip dependency checks\n"));
 			printf(_("  -f, --force          force install, overwrite conflicting files\n"));
 		} else if(op == PM_OP_REMOVE) {
@@ -93,6 +94,7 @@ static void usage(int op, const char * const myname)
 			printf("%s:  %s {-U --upgrade} [%s] <%s>\n", str_usg, myname, str_opt, str_file);
 			printf("%s:\n", str_opt);
 			printf(_("      --asdeps         install packages as non-explicitly installed\n"));
+			printf(_("      --asexplicit     install packages as explicitly installed\n"));
 			printf(_("  -d, --nodeps         skip dependency checks\n"));
 			printf(_("  -f, --force          force install, overwrite conflicting files\n"));
 		} else if(op == PM_OP_QUERY) {
@@ -115,6 +117,7 @@ static void usage(int op, const char * const myname)
 			printf("%s:  %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg);
 			printf("%s:\n", str_opt);
 			printf(_("      --asdeps         install packages as non-explicitly installed\n"));
+			printf(_("      --asexplicit     install packages as explicitly installed\n"));
 			printf(_("  -c, --clean          remove old packages from cache directory (-cc for all)\n"));
 			printf(_("  -d, --nodeps         skip dependency checks\n"));
 			printf(_("  -e, --dependsonly    install dependencies only\n"));
@@ -341,6 +344,7 @@ static int parseargs(int argc, char *argv[])
 		{"logfile",    required_argument, 0, 1009},
 		{"ignoregroup", required_argument, 0, 1010},
 		{"needed",     no_argument,       0, 1011},
+		{"asexplicit",     no_argument,   0, 1012},
 		{0, 0, 0, 0}
 	};
 
@@ -412,6 +416,9 @@ static int parseargs(int argc, char *argv[])
 				FREELIST(list);
 				break;
 			case 1011: config->flags |= PM_TRANS_FLAG_NEEDED; break;
+			case 1012:
+				config->flags |= PM_TRANS_FLAG_ALLEXPLICIT;
+				break;
 			case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break;
 			case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break;
 			case 'R': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_REMOVE); break;
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 678445d3..19e64442 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -194,6 +194,10 @@ void indentprint(const char *str, int indent)
 	const char *p = str;
 	int cidx = indent;
 
+	if(!p) {
+		return;
+	}
+
 	while(*p) {
 		if(*p == ' ') {
 			const char *next = NULL;