summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2005-11-14 10:43:13 +0000
committerMichael Vogt <mvo@debian.org>2005-11-14 10:43:13 +0000
commit98db4dafeaf684d411e41ed73fac089ffdfd2334 (patch)
treef02c8682568383892f188946ddf11e253db75475 /cmdline/apt-get.cc
parent927c393f1305925c1456c931e1e7b45afd6f051d (diff)
parenta3371852091e3590bd425f2674b56ae3d5ae2445 (diff)
* merged with apt--mvo
Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-116 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-117 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-118 Russian translation update by Yuri Kozlov * bubulle@debian.org--2005/apt--main--0--patch-119 Merge with Michael and add update-po as a pre-req for binary * bubulle@debian.org--2005/apt--main--0--patch-120 Re-generate all PO Files * bubulle@debian.org--2005/apt--main--0--patch-121 Complete French translation * bubulle@debian.org--2005/apt--main--0--patch-122 Correct typography in French translation * bubulle@debian.org--2005/apt--main--0--patch-123 Spelling fix for consistency in French translation * bubulle@debian.org--2005/apt--main--0--patch-124 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-125 Fixed localization of y/n questions in German translation * bubulle@debian.org--2005/apt--main--0--patch-126 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-127 Complete Tagalog translation / Add Changelog * bubulle@debian.org--2005/apt--main--0--patch-128 Danish translation update * bubulle@debian.org--2005/apt--main--0--patch-129 Basque translation update * 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 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85 * merged with bubulle, changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86 * merged the NMU from Franz Pop, fixed armeb problem (#333599) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87 * removed double armeb entry in buildlib/sizetable * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-88 * finalized changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-89 * turn off "secure-acquire" when --allow-unauthenticated is given
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 040f670b1..48b21a31f 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1200,7 +1200,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
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 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
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