From: David Kalnischkies Date: Wed, 14 Oct 2009 05:42:35 +0000 (+0200) Subject: merge Julians changes from lp:~mvo/apt/debian-sid X-Git-Tag: 0.7.25~8^2~7^2~4 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/4011e1137955decbb988e0098ba9f4fdbe6f2e4d?hp=-c merge Julians changes from lp:~mvo/apt/debian-sid --- 4011e1137955decbb988e0098ba9f4fdbe6f2e4d diff --combined debian/changelog index fc5965d3d,68ee83bac..313ae2865 --- a/debian/changelog +++ b/debian/changelog @@@ -11,18 -11,23 +11,29 @@@ apt (0.7.25) UNRELEASED; urgency=lo Closes: #479997 * Polish translation update by Wiktor Wandachowicz Closes: #548571 - - [ Michael Vogt ] + + [ David Kalnischkies ] * apt-pkg/packagemanager.cc: - - fix overly aggressive immediate config propergation - (thanks to David Kalnischkies) + - better debug output for ImmediateAdd with depth and why + - improve the message shown for failing immediate configuration + * doc/guide.it.sgml: moved to doc/it/guide.it.sgml + * doc/po4a.conf: activate translation of guide.sgml and offline.sgml + * doc/apt.conf.5.xml: + - provide a few more details about APT::Immediate-Configure + * doc/sources.list.5.xml: + - add note about additional apt-transport-methods + [ Julian Andres Klode ] + * doc/apt.conf.5.xml: + - Deprecate unquoted values, string concatenation and explain what should + not be written inside a value (quotes,backslash). + - Restrict option names to alphanumerical characters and "/-:._+". + - Deprecate #include, we have apt.conf.d nowadays which should be + sufficient. + * methods/https.cc: + - Add support for authentication using netrc (Closes: #518473), patch + by Jussi Hakala . + -- Michael Vogt Tue, 29 Sep 2009 15:51:34 +0200 apt (0.7.24) unstable; urgency=low diff --combined doc/apt.conf.5.xml index 36b65b073,a12524328..0cd63b31c --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@@ -59,8 -59,12 +59,12 @@@ between /* and */, just like C/C++ comments. Each line is of the form APT::Get::Assume-Yes "true"; The trailing - semicolon is required and the quotes are optional. A new scope can be - opened with curly braces, like: + semicolon and the quotes are required. The value must be on one line, and + there is no kind of string concatenation. It must not include inside quotes. + The behavior of the backslash "\" and escaped characters inside a value is + undefined and it should not be used. An option name may include + alphanumerical characters and the "/-:._+" characters. A new scope can + be opened with curly braces, like: APT { @@@ -91,7 -95,8 +95,8 @@@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg new entry will simply add a new option to the list. If you specify a name you can override the option as every other option by reassigning a new value to the option. - Two specials are allowed, #include and #clear: + Two specials are allowed, #include (which is deprecated + and not supported by alternative implementations) and #clear: #include will include the given file, unless the filename ends in a slash, then the whole directory is included. #clear is used to erase a part of the configuration tree. The @@@ -151,22 -156,11 +156,22 @@@ Immediate-Configure - Disable Immediate Configuration; This dangerous option disables some - of APT's ordering code to cause it to make fewer dpkg calls. Doing - so may be necessary on some extremely slow single user systems but - is very dangerous and may cause package install scripts to fail or worse. - Use at your own risk. + Defaults to on which will cause APT to install essential and important packages + as fast as possible in the install/upgrade operation. This is done to limit the effect of a failing + &dpkg; call: If this option is disabled APT doesn't treat an important package in the same way as + an extra package: Between the unpacking of the important package A and his configuration can then + be many other unpack or configuration calls, e.g. for package B which has no relation to A, but + causes the dpkg call to fail (e.g. because maintainer script of package B generates an error) which results + in a system state in which package A is unpacked but unconfigured - each package depending on A is now no + longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker + is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle + as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible + that APT encounters a situation in which it is unable to perform immediate configuration, error out and + refers to this option so the user can deactivate the immediate configuration temporary to be able to perform + an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now + in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package + in question, so you should not blindly disable this option as the mentioned scenario above is not the only + problem immediate configuration can help to prevent in the first place. Force-LoopBreak @@@ -337,7 -331,7 +342,7 @@@ as specified in /etc/fstab. It is possible to provide alternate mount and unmount commands if your mount point cannot be listed in the fstab (such as an SMB mount and old mount packages). The syntax - is to put "/cdrom/"::Mount "foo"; within + is to put /cdrom/::Mount "foo"; within the cdrom block. It is important to have the trailing slash. Unmount commands can be specified using UMount.