- only print errors if all tries to get a package by string failed

* 

1 files changed, 12 insertions, 6 deletions

diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc
index 88a98fdbe..2b00187d8 100644
--- a/cmdline/cacheset.cc
+++ b/cmdline/cacheset.cc
@@ -200,15 +200,21 @@ PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, C
 		pkgset.insert(Pkg);
 		return pkgset;
 	}
+
+	_error->PushToStack();
+
 	PackageSet pset = FromTask(Cache, str, helper);
-	if (pset.empty() == false)
-		return pset;
+	if (pset.empty() == true) {
+		pset = FromRegEx(Cache, str, helper);
+		if (pset.empty() == true)
+			pset = helper.canNotFindPackage(Cache, str);
+	}
 
-	pset = FromRegEx(Cache, str, helper);
 	if (pset.empty() == false)
-		return pset;
-
-	return helper.canNotFindPackage(Cache, str);
+		_error->RevertToStack();
+	else
+		_error->MergeWithStack();
+	return pset;
 }
 									/*}}}*/
 // GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/