From 583958a8947777012bfca6f24b2893e39879e9d0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 22 Oct 2005 10:46:33 +0000 Subject: * fix a incorrect example --- configure.in | 2 +- debian/changelog | 7 +++++++ doc/apt_preferences.5.xml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 87dac8e47..18cdbfdde 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.41.1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.43") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 6b858cdcd..090f1f843 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.43) unstable; urgency=low + + * fix a incorrect example in the apt_prefrences man page + (thanks to Filipus Klutiero, closes: #282918) + + -- Michael Vogt Fri, 21 Oct 2005 11:23:42 +0200 + apt (0.6.42) unstable; urgency=low * apt-pkg/cdrom.cc: diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 12b03196a..3e50bef8c 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -183,7 +183,7 @@ belonging to any distribution whose Archive name is "unstable Package: * Pin: release a=unstable -Pin-Priority: 500 +Pin-Priority: 50 The following record assigns a high priority to all package versions -- cgit v1.2.3 From 960d4d245dfecab6fd41ab82b59b2e10c0a40946 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 22 Oct 2005 21:48:27 +0000 Subject: * revert patch from patch-59, causes all sorts of trouble --- apt-pkg/pkgrecords.cc | 5 +---- apt-pkg/pkgrecords.h | 1 - debian/changelog | 7 +++++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc index 1d71d3e2f..9c2655d6a 100644 --- a/apt-pkg/pkgrecords.cc +++ b/apt-pkg/pkgrecords.cc @@ -42,9 +42,6 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) if (Files[I->ID] == 0) return; } - // We store that to make sure that the destructor won't segfault, - // even if the Cache object was destructed before this instance. - PackageFileCount = Cache.HeaderP->PackageFileCount; } /*}}}*/ // Records::~pkgRecords - Destructor /*{{{*/ @@ -52,7 +49,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0) /* */ pkgRecords::~pkgRecords() { - for (unsigned I = 0; I != PackageFileCount; I++) + for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++) delete Files[I]; delete [] Files; } diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index f31e83afe..08f004414 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -33,7 +33,6 @@ class pkgRecords pkgCache &Cache; Parser **Files; - int PackageFileCount; public: diff --git a/debian/changelog b/debian/changelog index 090f1f843..3bbbf3b29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -apt (0.6.43) unstable; urgency=low +apt (0.6.42.1) unstable; urgency=low * fix a incorrect example in the apt_prefrences man page (thanks to Filipus Klutiero, closes: #282918) + * apt-pkg/pkgrecords.cc: + - revert patch from last version, it causes trouble on alpha + and ia64 (closes: #335102, #335103,#335213) - -- Michael Vogt Fri, 21 Oct 2005 11:23:42 +0200 + -- Michael Vogt Sat, 22 Oct 2005 23:44:35 +0200 apt (0.6.42) unstable; urgency=low -- cgit v1.2.3 From 849eef0c94ee30fd6e0fb38f54ed308a6b138a5c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 22 Oct 2005 21:50:03 +0000 Subject: * fix changelog --- configure.in | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 18cdbfdde..758727f2f 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.43") +AC_DEFINE_UNQUOTED(VERSION,"0.6.42.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 3bbbf3b29..932ac592f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ apt (0.6.42.1) unstable; urgency=low (thanks to Filipus Klutiero, closes: #282918) * apt-pkg/pkgrecords.cc: - revert patch from last version, it causes trouble on alpha - and ia64 (closes: #335102, #335103,#335213) + and ia64 (closes: #335102, #335103) -- Michael Vogt Sat, 22 Oct 2005 23:44:35 +0200 -- cgit v1.2.3 From 7049e4e9ca6db15326d8a76f4f5f9ab592a925e3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 23 Oct 2005 09:27:12 +0000 Subject: * be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL --- cmdline/apt-get.cc | 6 +++++- debian/changelog | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 3475d79ae..040f670b1 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(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,6 +1211,10 @@ 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 932ac592f..9716c3836 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.6.42.1) unstable; urgency=low * apt-pkg/pkgrecords.cc: - revert patch from last version, it causes trouble on alpha and ia64 (closes: #335102, #335103) + * cmdline/apt-get.cc: + - be extra carefull in FindSrc (closes: #335213) -- Michael Vogt Sat, 22 Oct 2005 23:44:35 +0200 -- cgit v1.2.3