From: Christian Perrier <bubulle@debian.org>
Date: Tue, 1 Nov 2005 17:25:04 +0000 (+0000)
Subject: Merge with Michael
X-Git-Tag: 0.7.24ubuntu1~290^2~2^2~5
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2cf1aee845ce86e6dba7a069ce6ad5edefae1331?hp=-c

Merge with Michael

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83
   * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84
   * added armeb to archtable
---

2cf1aee845ce86e6dba7a069ce6ad5edefae1331
diff --combined cmdline/apt-get.cc
index 040f670b1,48b21a31f..b2beb3c2b
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -1200,7 -1200,7 +1200,7 @@@ pkgSrcRecords::Parser *FindSrc(const ch
        VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end());
        TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash);
     } 
-    else  if(DefRel.empty() == false)
+    else  if(!Pkg.end() && DefRel.empty() == false)
     {
        // we have a default release, try to locate the pkg. we do it like
        // this because GetCandidateVer() will not "downgrade", that means
@@@ -1211,10 -1211,6 +1211,10 @@@
  	 for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false;
  	      VF++)
  	 {
 +	    // extra paranioa
 +	    if(VF.File() == NULL)
 +	       continue;
 +
  	    /* If this is the status file, and the current version is not the
  	       version in the status file (ie it is not installed, or somesuch)
  	       then it is not a candidate for installation, ever. This weeds