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

*

diff --git a/cmdline/cacheset.cc b/cmdline/cacheset.cc
index 88a98fdbe95d9f0dbfabba3117ee4737eac2349c..2b00187d8b3086ec20b3313f8eb8c268d3318045 100644 (file)
--- 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/*{{{*/

diff --git a/debian/changelog b/debian/changelog
index fbe814d84dcd536c715416ea8fc397cd862da51f..32a18cf599104edc18a7c7b85ef28c0cce67a787 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low
     - get the candidate either from an already built depcache
       or use the policy which is a bit faster than depcache generation
     - get packages by task^ with FromTask()
+    - only print errors if all tries to get a package by string failed
   * cmdline/apt-get.cc:
     - use the cachsets in the install commands
   * apt-pkg/orderlist.cc:
@@ -29,8 +30,9 @@ apt (0.7.26~exp8) UNRELEASED; urgency=low
   * apt-pkg/contrib/fileutl.cc:
     - show notice about ignored file instead of being always silent
     - add a Dir::Ignore-Files-Silently list option to control the notice
+  * 
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 26 Jun 2010 20:43:09 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 26 Jun 2010 21:17:08 +0200
 
 apt (0.7.26~exp7) experimental; urgency=low