* apt-pkg/pkgcache.cc:

  - prefer non-virtual packages in FindPreferredPkg

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 1dcc345329aa3a88922ee657019a039db0ee42f6..0be9368bd7103b6080d800781c073ea479bf0ca6 100644 (file)
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -115,8 +115,11 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
        /** \brief find the package with the "best" architecture
 
            The best architecture is either the "native" or the first
-           in the list of Architectures which is not an end-Pointer */
-       PkgIterator FindPreferredPkg() const;
+           in the list of Architectures which is not an end-Pointer
+
+           \param PreferNonVirtual tries to respond with a non-virtual package
+                  and only if this fails returns the best virtual package */
+       PkgIterator FindPreferredPkg(bool const &PreferNonVirtual = true) const;
        PkgIterator NextPkg(PkgIterator const &Pkg) const;
 
        // Constructors

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 8af8ef7de596d967314dc973b8cbb29fe3b27980..9e1f8b633e22c0f17287a5415a51def2d27697a5 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -349,19 +349,21 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPkg(string Arch) const {
 // GrpIterator::FindPreferredPkg - Locate the "best" package           /*{{{*/
 // ---------------------------------------------------------------------
 /* Returns an End-Pointer on error, pointer to the package otherwise */
-pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg() const {
+pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg(bool const &PreferNonVirtual) const {
        pkgCache::PkgIterator Pkg = FindPkg("native");
-       if (Pkg.end() == false)
+       if (Pkg.end() == false && (PreferNonVirtual == false || Pkg->VersionList != 0))
                return Pkg;
 
        std::vector<std::string> const archs = APT::Configuration::getArchitectures();
        for (std::vector<std::string>::const_iterator a = archs.begin();
             a != archs.end(); ++a) {
                Pkg = FindPkg(*a);
-               if (Pkg.end() == false)
+               if (Pkg.end() == false && (PreferNonVirtual == false || Pkg->VersionList != 0))
                        return Pkg;
        }
 
+       if (PreferNonVirtual == true)
+               return FindPreferredPkg(false);
        return PkgIterator(*Owner, 0);
 }
                                                                        /*}}}*/

diff --git a/debian/changelog b/debian/changelog
index 04829715c1b4169b168fdb039c3d7f39959e6edf..aff194e1cc85bec20b4bef456e710a0ce2314bbe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ apt (0.7.26~exp11) experimental; urgency=low
     - be able to omit dependency types in (r)depends (Closes: #319006)
   * apt-pkg/cacheset.cc:
     - move them back to the library as they look stable now
+  * apt-pkg/pkgcache.cc:
+    - prefer non-virtual packages in FindPreferredPkg
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 17 Jul 2010 19:56:47 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 25 Jul 2010 08:20:41 +0200
 
 apt (0.7.26~exp10) experimental; urgency=low