merged from davids branch

[apt.git] / cmdline / apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 672f64c6887e80d7dda8ffe12a368d3d2950e7ef..26c731978bc442aae4fbd9cbde5ea03f4817b318 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1264,6 +1264,11 @@ bool TryToChangeVer(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
    }
    
    Cache.SetCandidateVersion(Ver);
    }
    
    Cache.SetCandidateVersion(Ver);

+
+   // Set the all package to the same candidate
+   if (Ver.Pseudo() == true)
+      Cache.SetCandidateVersion(Match.Find(Pkg.Group().FindPkg("all")));
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -1310,6 +1315,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
                  break;
               fuzzy = true;
               Ver = Pkg.VersionList();
                  break;
               fuzzy = true;
               Ver = Pkg.VersionList();

+              // exit right away from the Pkg.VersionList() loop if we
+              // don't have any versions
+              if (Ver.end() == true)
+                 break;

            }
            // We match against a concrete version (or a part of this version)
            if (VerTag.empty() == false &&
            }
            // We match against a concrete version (or a part of this version)
            if (VerTag.empty() == false &&