From d5f38102698899c4d3693583247a71f54ea1b278 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 24 Oct 2005 08:28:53 +0000 Subject: * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213) --- cmdline/apt-get.cc | 6 +----- debian/changelog | 2 ++ 2 files changed, 3 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 diff --git a/debian/changelog b/debian/changelog index 567dc803e..a7ea0c954 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.6.42.2) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-118: - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) + * cmdline/apt-get.cc: + - bufix in FindSrc (closes: #335213) -- -- cgit v1.2.3 From c5198dc1d0edeb3999741f00a25ec946cd66d6b9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Oct 2005 09:23:47 +0000 Subject: * added armeb to archtable --- buildlib/archtable | 1 + buildlib/sizetable | 1 + debian/changelog | 1 + 3 files changed, 3 insertions(+) diff --git a/buildlib/archtable b/buildlib/archtable index b01743c02..af1123d02 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -11,6 +11,7 @@ sparc sparc sparc64 sparc alpha.* alpha m68k m68k +armeb.* armeb arm.* arm powerpc powerpc ppc powerpc diff --git a/buildlib/sizetable b/buildlib/sizetable index 911180145..51a136d4a 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -12,6 +12,7 @@ # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 arm little 1 4 2 4 +armeb big 1 4 2 4 alpha little 1 4 2 8 mipsel little 1 4 2 4 sparc big 1 4 2 4 diff --git a/debian/changelog b/debian/changelog index a7ea0c954..a4e403030 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ apt (0.6.42.2) unstable; urgency=low - patch-118: Russian translation update by Yuri Kozlov (closes: #335164) * cmdline/apt-get.cc: - bufix in FindSrc (closes: #335213) + * added armeb to archtable (closes: #333599) -- -- cgit v1.2.3