From: Michael Vogt Date: Thu, 8 Dec 2005 11:02:56 +0000 (+0000) Subject: * updated to apt--mvo X-Git-Tag: 0.7.24ubuntu1~254^2~4 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/bc03039d0f532b6463de33bff60c7d876af6ea5e?hp=-c * updated to apt--mvo Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-132 Completed Simplified Chinese translation * bubulle@debian.org--2005/apt--main--0--patch-133 Merge with Michael AND update PO files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94 * pkgDirStream has (slightly) better extract support now * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95 * merge fix for #339533 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-96 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97 * some more debug output * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98 * ABI change: merged more flexible pkgAcquireFile code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99 * merged http download limit for apt (#146877) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100 * applied parts of the string speedup patch from debian #319377 (ABI change) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101 * fix for #340448 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102 * finalized this release * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-103 * changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-104 * build-depend on libdb4.3 now, fix for kFreeBSD (#317718) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105 * fix mailaddress * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106 * fix a string (thanks to bubulle) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-107 * merged with bubulle --- bc03039d0f532b6463de33bff60c7d876af6ea5e diff --combined apt-pkg/makefile index 0e6aecc65,0e6aecc65..ab0ff8005 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@@ -13,7 -13,7 +13,7 @@@ include ../buildlib/defaults.ma # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) --MAJOR=3.11 ++MAJOR=3.12 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) APT_DOMAIN:=libapt-pkg$(MAJOR) diff --combined apt-pkg/packagemanager.cc index cc87444ea,4b3dd8be2..b0dd43629 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@@ -106,7 -106,7 +106,7 @@@ bool pkgPackageManager::FixMissing( // Okay, this file is missing and we need it. Mark it for keep Bad = true; - Cache.MarkKeep(I); + Cache.MarkKeep(I, false, false); } // We have to empty the list otherwise it will not have the new changes @@@ -593,7 -593,7 +593,7 @@@ pkgPackageManager::OrderResult pkgPacka Pkg.State() == pkgCache::PkgIterator::NeedsNothing && (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall) { - _error->Error("Internal Error, trying to manipulate a kept package"); + _error->Error("Internal Error, trying to manipulate a kept package (%s)",Pkg.Name()); return Failed; } @@@ -631,11 -631,14 +631,11 @@@ // --------------------------------------------------------------------- /* This uses the filenames in FileNames and the information in the DepCache to perform the installation of packages.*/ -pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd) +pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int statusFd) { - OrderResult Res = OrderInstall(); - if(Debug) - std::clog << "OrderInstall() returned: " << Res << std::endl; - if (Res != Failed) - if (Go(status_fd) == false) - return Failed; - return Res; + if(DoInstallPreFork() == Failed) + return Failed; + + return DoInstallPostFork(statusFd); } /*}}}*/ diff --combined apt-pkg/pkgcachegen.cc index 04904057f,de854bee5..e9985e1cb --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@@ -26,8 -26,6 +26,8 @@@ #include #include +#include + #include #include @@@ -268,7 -266,7 +268,7 @@@ bool pkgCacheGenerator::MergeFileProvid // CacheGenerator::NewPackage - Add a new package /*{{{*/ // --------------------------------------------------------------------- /* This creates a new package structure and adds it to the hash table */ - bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,string Name) + bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg,const string &Name) { Pkg = Cache.FindPkg(Name); if (Pkg.end() == false) @@@ -332,7 -330,7 +332,7 @@@ bool pkgCacheGenerator::NewFileVer(pkgC // --------------------------------------------------------------------- /* This puts a version structure in the linked list */ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver, - string VerStr, + const string &VerStr, unsigned long Next) { // Get a structure @@@ -356,8 -354,8 +356,8 @@@ /* This creates a dependency element in the tree. It is linked to the version and to the package that it is pointing to. */ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, - string PackageName, - string Version, + const string &PackageName, + const string &Version, unsigned int Op, unsigned int Type) { @@@ -421,8 -419,8 +421,8 @@@ // --------------------------------------------------------------------- /* */ bool pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator Ver, - string PackageName, - string Version) + const string &PackageName, + const string &Version) { pkgCache &Cache = Owner->Cache; @@@ -461,7 -459,7 +461,7 @@@ // --------------------------------------------------------------------- /* This is used to select which file is to be associated with all newly added versions. The caller is responsible for setting the IMS fields. */ - bool pkgCacheGenerator::SelectFile(string File,string Site, + bool pkgCacheGenerator::SelectFile(const string &File,const string &Site, const pkgIndexFile &Index, unsigned long Flags) { @@@ -545,7 -543,7 +545,7 @@@ unsigned long pkgCacheGenerator::WriteU /* This just verifies that each file in the list of index files exists, has matching attributes with the cache and the cache does not have any extra files. */ - static bool CheckValidity(string CacheFile, FileIterator Start, + static bool CheckValidity(const string &CacheFile, FileIterator Start, FileIterator End,MMap **OutMap = 0) { // No file, certainly invalid diff --combined debian/changelog index 8ebc2e755,86ca0135d..ed893114b --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,29 +1,29 @@@ - apt (0.6.42.4) unstable; urgency=low + apt (0.6.43.1) unstable; urgency=low - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: - * zh_CN.po: Completed to 507 strings(Closes: #338267) + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-133: + * fr.po: Completed to 510 strings + + -- Michael Vogt Wed, 30 Nov 2005 10:14:02 +0100 + + apt (0.6.43) unstable; urgency=medium + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: + * zh_CN.po: Completed to 510 strings(Closes: #338267) * gl.po: Completed to 510 strings (Closes: #338356) * added support for "/etc/apt/sources.list.d" directory (closes: #66325) + * make pkgDirStream (a bit) more complete + * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows) + (closes: #339533) + * pkgAcqFile is more flexible now (closes: #57091) + * support a download rate limit for http (closes: #146877) + * included lots of the speedup changes from #319377 + * add stdint.h to contrib/md5.h (closes: #340448) + * ABI change, library name changed (closes: #339147) + * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718) + * switch to libdb4.3 in build-depends - -- Michael Vogt Wed, 16 Nov 2005 17:13:05 +0100 + -- Michael Vogt Tue, 29 Nov 2005 00:17:07 +0100 apt (0.6.42.3) unstable; urgency=low @@@ -180,7 -197,6 +197,7 @@@ apt (0.6.37) breezy; urgency=lo * Add Welsh translation from Dafydd Harries (daf@muse.19inch.net--2005/apt--main--0--patch-1) * Change debian/bugscript to use #!/bin/bash (Closes: #313402) + * Fix a incorrect example in the man-page (closes: #282918) -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 diff --combined doc/examples/configure-index index 50ca5084b,9e851d753..8a68e2892 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -24,15 -24,11 +24,15 @@@ AP { Architecture "i386"; Build-Essential "build-essential"; - + + NeverAutoRemove { "linux-kernel.*"; }; // packages that should never + // considered for autoRemove + // Options for apt-get Get { Arch-Only "false"; + AutomaticRemove "false"; Download-Only "false"; Simulate "false"; Assume-Yes "false"; @@@ -121,6 -117,7 +121,7 @@@ Acquir No-Cache "false"; Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate }; ftp @@@ -252,8 -249,7 +253,8 @@@ Debu pkgDPkgPM "false"; pkgDPkgProgressReporting "false"; pkgOrderList "false"; - + pkgAutoRemove "false"; // show information about automatic removes + pkgInitialize "false"; // This one will dump the configuration space NoLocking "false"; Acquire::Ftp "false"; // Show ftp command traffic