From: Michael Vogt Date: Thu, 30 Jul 2009 13:31:39 +0000 (+0200) Subject: merged from debian-sid X-Git-Tag: 0.7.22.1~6^2~1 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/57722714255118560c98b3245413ff5f693b993c?hp=-c merged from debian-sid --- 57722714255118560c98b3245413ff5f693b993c diff --combined cmdline/apt-get.cc index 2693bd968,2ca0855b6..ab6dca388 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@@ -111,6 -111,9 +111,9 @@@ class CacheFile : public pkgCacheFil return Open(true); } CacheFile() : List(0) {}; + ~CacheFile() { + delete[] List; + } }; /*}}}*/ @@@ -594,7 -597,6 +597,6 @@@ void Stats(ostream &out,pkgDepCache &De Dep.BadCount()); } /*}}}*/ - // CacheFile::NameComp - QSort compare by name /*{{{*/ // --------------------------------------------------------------------- /* */ @@@ -687,7 -689,10 +689,10 @@@ bool CacheFile::CheckDeps(bool AllowBro return true; } - + /*}}}*/ + // CheckAuth - check if each download comes form a trusted source /*{{{*/ + // --------------------------------------------------------------------- + /* */ static bool CheckAuth(pkgAcquire& Fetcher) { string UntrustedList; @@@ -728,10 -733,7 +733,7 @@@ return _error->Error(_("There are problems and -y was used without --force-yes")); } - - /*}}}*/ - // InstallPackages - Actually download and install the packages /*{{{*/ // --------------------------------------------------------------------- /* This displays the informative messages describing what is going to @@@ -1260,8 -1262,7 +1262,8 @@@ pkgSrcRecords::Parser *FindSrc(const ch /* Lookup the version of the package we would install if we were to install a version and determine the source package name, then look in the archive for a source package of the same name. */ - if (_config->FindB("APT::Get::Only-Source") == false) + bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source"); + if (MatchSrcOnly == false) { if (Pkg.end() == false) { @@@ -1279,6 -1280,7 +1281,6 @@@ unsigned long Offset = 0; string Version; bool IsMatch = false; - bool MatchSrcOnly = false; // No source package name.. if (Src.empty() == true) @@@ -1301,9 -1303,9 +1303,9 @@@ while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) { string Ver = Parse->Version(); - + // show name mismatches - if (IsMatch == true && Parse->Package() != Src) + if (IsMatch == true && Parse->Package() != Src) ioprintf(c1out, _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str()); if (VerTag.empty() == false) @@@ -1335,7 -1337,6 +1337,6 @@@ return Last; } /*}}}*/ - // DoUpdate - Update the package lists /*{{{*/ // --------------------------------------------------------------------- /* */ @@@ -1457,7 -1458,7 +1458,7 @@@ bool DoAutomaticRemove(CacheFile &Cache } return true; } - + /*}}}*/ // DoUpgrade - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old @@@ -1532,7 -1533,7 +1533,7 @@@ bool TryInstallTask(pkgDepCache &Cache regfree(&Pattern); return res; } - + /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@@ -1870,7 -1871,8 +1871,8 @@@ bool DoInstall(CommandLine &CmdL // cache.commit() if (AutoMarkChanged > 0 && Cache->DelCount() == 0 && Cache->InstCount() == 0 && - Cache->BadCount() == 0) + Cache->BadCount() == 0 && + _config->FindB("APT::Get::Simulate",false) == false) Cache->writeStateFile(NULL); // See if we need to prompt @@@ -2522,7 -2524,7 +2524,7 @@@ bool DoBuildDep(CommandLine &CmdL { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; - if(_config->FindB("APT::Get::Build-Dep-Automatic", true) == true) + if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true) Cache->MarkAuto(Pkg, true); continue; } @@@ -2698,8 -2700,7 +2700,7 @@@ void SigWinch(int #endif } /*}}}*/ - - int main(int argc,const char *argv[]) + int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, @@@ -2739,7 -2740,6 +2740,6 @@@ {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, {0,"auto-remove","APT::Get::AutomaticRemove",0}, - {0,"build-dep-automatic","APT::Get::Build-Dep-Automatic",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, {0,"fix-policy","APT::Get::Fix-Policy-Broken",0}, @@@ -2789,7 -2789,19 +2789,19 @@@ ShowHelp(CmdL); return 0; } - + + // simulate user-friendly if apt-get has no root privileges + if (getuid() != 0 && _config->FindB("APT::Get::Simulate") == true) + { + if (_config->FindB("APT::Get::Show-User-Simulation-Note",true) == true) + cout << _("NOTE: This is only a simulation!\n" + " apt-get needs root privileges for real execution.\n" + " Keep also in mind that locking is deactivated,\n" + " so don't depend on the relevance to the real current situation!" + ) << std::endl; + _config->Set("Debug::NoLocking",true); + } + // Deal with stdout not being a tty if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) _config->Set("quiet","1"); @@@ -2821,3 -2833,4 +2833,4 @@@ return 0; } + /*}}}*/ diff --combined debian/changelog index 59a88ca21,3d5db5f48..d39bf3d2f --- a/debian/changelog +++ b/debian/changelog @@@ -1,21 -1,52 +1,60 @@@ - apt (0.7.22) unstable; urgency=low ++apt (0.7.23) unstable; urgency=low + + * cmdline/apt-get.cc: + - honor APT::Get::Only-Source properly in FindSrc() (thanks to + Martin Pitt for reporting the problem) + + -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 + - apt (0.7.21) UNRELEASED; urgency=low + apt (0.7.22) unstable; urgency=low - [ Osamu Aoki ] - * Updated cron script to support backups by hardlinks and - verbose levels. All features turned off by default. - * Added more error handlings. Closes: #438803, #462734, #454989, - * Documented all cron script related configuration items in - configure-index. + [ Christian Perrier ] + * Documentation translations: + - Fix a typo in apt-get(8) French translation. Closes: #525043 + Thanks to Guillaume Delacour for spotting it. + - Updated apt.conf(5) manpgae French translation. + Thanks to Aurélien Couderc. + * Translations: + - fr.po + - sk.po. Closes: #525857 + - ru.po. Closes: #526816 + - eu.po. Closes: #528985 + - zh_CN.po. Closes: #531390 + - fr.po + - it.po. Closes: #531758 + - ca.po. Closes: #531921 + - de.po. Closes: #536430 + * Added translations + - ast.po (Asturian by Marcos Alvareez Costales). + Closes: #529007, #529730, #535328 + + [ David Kalnischkies ] + * [ABI break] support '#' in apt.conf and /etc/apt/preferences + (closes: #189866) + * [ABI break] Allow pinning by codename (closes: #97564) + * support running "--simulate" as user + * add depth information to the debug output and show what depends + type triggers a autoinst (closes: #458389) + * add Debug::pkgDepCache::Marker with more detailed debug output + (closes: #87520) + * add Debug::pkgProblemResolver::ShowScores and make the scores + adjustable + * do not write state file in simulate mode (closes: #433007) + * add hook for MarkInstall and MarkDelete (closes: #470035) + * fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work + correctly when downloading from multiple sites (Closes: #534752) + * add the various foldmarkers in apt-pkg & cmdline (no code change) + * versions with a pin of -1 shouldn't be a candidate (Closes: #355237) + * prefer mmap as memory allocator in MMap instead of a static char + array which can (at least in theory) grow dynamic + * eliminate (hopefully all) segfaults in pkgcachegen.cc and mmap.cc + which can arise if cache doesn't fit into the mmap (Closes: #535218) + * display warnings instead of errors if the parts dirs doesn't exist [ Michael Vogt ] + * honor the dpkg hold state in new Marker hooks (closes: #64141) + * debian/apt.cron.daily: + - if the timestamp is too far in the future, delete it * apt-pkg/acquire.cc: - make the max pipeline depth of the acquire queue configurable via Acquire::Max-Pipeline-Depth @@@ -23,6 -54,8 +62,8 @@@ - add Dpkg::UseIoNice boolean option to run dpkg with ionice -c3 (off by default) - send "dpkg-exec" message on the status fd when dpkg is run + - provide DPkg::Chroot-Directory config option (useful for testing) + - fix potential hang when in a backgroud process group * apt-pkg/algorithms.cc: - consider recommends when making the scores for the problem resolver @@@ -33,8 -66,6 +74,6 @@@ * methods/http.cc: - ignore SIGPIPE, we deal with EPIPE from write in HttpMethod::ServerDie() (LP: #385144) - * apt-pkg/deb/dpkgpm.cc: - - provide DPkg::Chroot-Directory config option (useful for testing) * Only run Download-Upgradable and Unattended-Upgrades if the initial update was successful Closes: #341970 * apt-pkg/indexcopy.cc: @@@ -43,60 -74,126 +82,126 @@@ (LP: #255545) - remove the gettext from a string that consists entirely of variables (LP: #56792) - * doc/makefile: - - add examples/apt-https-method-example.conf * apt-pkg/cacheiterators.h: - add missing checks for Owner == 0 in end() - * apt-pkg/deb/dpkgpm.cc: - - fix potential hang when in a backgroud process group * apt-pkg/indexrecords.cc: - fix some i18n issues * apt-pkg/contrib/strutl.h: - add new strprintf() function to make i18n strings easier - * methods/gpgv.cc: - fix compiler warning - * cmdline/apt-get.cc: - - fix "apt-get source pkg=ver" if binary name != source name - and show a message (LP: #202219) - - fix "apt-get source pkg" if there is a binary package and - a source package of the same name but from different - packages (LP: #330103) * apt-pkg/deb/debsystem.cc: - make strings i18n able - * apt-pkg/contrib/strutl.cc: - - fix TimeToStr i18n (LP: #289807) - * [ABI break] merge support for http redirects, thanks to - Jeff Licquia and Anthony Towns - * [ABI break] use int for the package IDs (thanks to Steve Cotton) - * apt-pkg/pkgcache.cc: - - do not run "dpkg --configure pkg" if pkg is in trigger-awaited - state (LP: #322955) - * methods/https.cc: - - add Acquire::https::AllowRedirect support - * methods/gpgv.cc: - - properly check for expired and revoked keys (closes: #433091) * fix problematic use of tolower() when calculating the version hash by using locale independant tolower_ascii() function. Thanks to M. Vefa Bicakci (LP: #80248) * build fixes for g++-4.4 * cmdline/apt-mark: - add "showauto" option to show automatically installed packages + * document --install-recommends and --no-install-recommends + (thanks to Dereck Wonnacott, LP: #126180) * doc/apt.conf.5.xml: - merged patch from Aurélien Couderc to improve the text (thanks!) + * [ABI] merged the libudev-dlopen branch, this allows to pass + "apt-udev-auto" to Acquire::Cdrom::mount and the cdrom method will + dynamically find/mount the cdrom device (if libhal is available) + + [ Julian Andres Klode ] + * apt-pkg/contrib/configuration.cc: Fix a small memory leak in + ReadConfigFile. + * Introduce support for the Enhances field. (Closes: #137583) + * Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512) + * configure-index: document Dir::Etc::SourceParts and some other options + (Closes: #459605) + * Remove Eugene V. Lyubimkin from uploaders as requested. + * apt-pkg/contrib/hashes.cc, apt-pkg/contrib/md5.cc: + - Support reading until EOF if Size=0 to match behaviour of + SHA1Summation and SHA256Summation + + [ Osamu Aoki ] + * Updated cron script to support backups by hardlinks and + verbose levels. All features turned off by default. + * Added more error handlings. Closes: #438803, #462734, #454989, + * Documented all cron script related configuration items in + configure-index. [ Dereck Wonnacott ] * apt-ftparchive might write corrupt Release files (LP: #46439) * Apply --important option to apt-cache depends (LP: #16947) - * Clarify the --help for 'purge' (LP: #243948) + [ Otavio Salvador ] + * Apply patch from Sami Liedes to reduce the + number of times we call progress bar updating and debugging + configuration settings. + * Apply patch from Sami Liedes to avoid unecessary + temporary allocations. + + -- Michael Vogt Wed, 29 Jul 2009 19:16:22 +0200 + + apt (0.7.21) unstable; urgency=low + + [ Christian Perrier ] + * Translations: + - bg.po. Closes: #513211 + - zh_TW.po. Closes: #513311 + - nb.po. Closes: #513843 + - fr.po. Closes: #520430 + - sv.po. Closes: #518070 + - sk.po. Closes: #520403 + - it.po. Closes: #522222 + - sk.po. Closes: #520403 + + [ Jamie Strandboge ] + * apt.cron.daily: catch invalid dates due to DST time changes + in the stamp files + + [ Michael Vogt ] + * methods/gpgv.cc: + - properly check for expired and revoked keys (closes: #433091) + * apt-pkg/contrib/strutl.cc: + - fix TimeToStr i18n (LP: #289807) + * [ABI break] merge support for http redirects, thanks to + Jeff Licquia and Anthony Towns + * [ABI break] use int for the package IDs (thanks to Steve Cotton) + * apt-pkg/pkgcache.cc: + - do not run "dpkg --configure pkg" if pkg is in trigger-awaited + state (LP: #322955) + * methods/https.cc: + - add Acquire::https::AllowRedirect support + * Clarify the --help for 'purge' (LP: #243948) + * cmdline/apt-get.cc + - fix "apt-get source pkg" if there is a binary package and + a source package of the same name but from different + packages (LP: #330103) [ Colin Watson ] * cmdline/acqprogress.cc: - Call pkgAcquireStatus::Pulse even if quiet, so that we still get dlstatus messages on the status-fd (LP: #290234). - -- Michael Vogt Fri, 12 Sep 2008 11:34:24 +0200 + -- Michael Vogt Tue, 14 Apr 2009 14:12:51 +0200 + + apt (0.7.20.2) unstable; urgency=medium + + [ Eugene V. Lyubimkin ] + * Urgency set to medium due to RC bug fix. + * doc/apt.ent, apt-get.8.xml: + - Fix invalid XML entities. (Closes: #514402) + + -- Eugene V. Lyubimkin Sat, 07 Feb 2009 16:48:21 +0200 + + apt (0.7.20.1) unstable; urgency=low + + [ Michael Vogt ] + * apt-pkg/pkgcachegen.cc: + - fix apt-cache search for localized description + (closes: #512110) + + [ Christian Perrier ] + * Translations: + - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. + + -- Michael Vogt Tue, 20 Jan 2009 09:35:05 +0100 apt (0.7.20) unstable; urgency=low @@@ -112,35 -209,37 +217,37 @@@ (Closes: #457265) - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. (Closes: #438559) - - [ Michael Vogt ] - * apt-pkg/depcache.cc: - - when checking for new important deps, skip critical ones - (LP: #236360) - * document --install-recommends and --no-install-recommends - (thanks to Dereck Wonnacott, LP: #126180) - * make "apt-get build-dep" installed packages marked automatic - by default. This can be changed by setting the value of - APT::Get::Build-Dep-Automatic to false (thanks to Aaron - Haviland, closes: #44874, LP: #248268) - - -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 - - apt (0.7.20~exp2) unstable; urgency=low - - [ Eugene V. Lyubimkin ] + - Mentioned '/* ... */' comments. (Closes: #507601) * doc/examples/sources.list: - Removed obsolete commented non-us deb-src entry, replaced it with 'deb-src security.debian.org' one. (Closes: #411298) * apt-pkg/contrib/mmap.cc: - Added instruction how to work around MMap error in MMap error message. (Closes: #385674, 436028) + * COPYING: + - Actualized. Removed obsolete Qt section, added GPLv2 clause. + (Closes: #440049, #509337) + + [ Michael Vogt ] + * add option to "apt-get build-dep" to mark the needed + build-dep packages as automatic installed. + This is controlled via the value of + APT::Get::Build-Dep-Automatic and is set "false" by default. + Thanks to Aaron Haviland, closes: #448743 + * apt-inst/contrib/arfile.cc: + - support members ending with '/' as well (thanks to Michal Cihr, + closes: #500988) [ Christian Perrier ] * Translations: + - Finnish updated. Closes: #508449 + - Galician updated. Closes: #509151 + - Catalan updated. Closes: #509375 + - Vietnamese updated. Closes: #509422 + - Traditional Chinese added. Closes: #510664 - French corrected (remove awful use of first person) - -- Michael Vogt Tue, 02 Dec 2008 20:30:14 +0100 + -- Michael Vogt Mon, 05 Jan 2009 08:59:20 +0100 apt (0.7.19) unstable; urgency=low @@@ -158,7 -257,6 +265,6 @@@ is a request to install only one package and it is not installable. (Closes: #419521) - [ Michael Vogt ] - fix SIGHUP handling (closes: #463030)