From 50c409c42a971c6e8a25cb32a87992474247834b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 4 Sep 2009 19:32:45 +0200 Subject: add a helper to easily get a vector of strings from the configuration --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 550addc92..349c95038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ apt (0.7.24) UNRELEASED; urgency=low - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9 * buildlib/po4a_manpage.mak, doc/makefile, configure: - simplify the makefiles needed for po4a manpages + * apt-pkg/contrib/configuration.cc: + - add a helper to easily get a vector of strings from the config -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 1f99b6d338186efe80e314268db44600d3c94a1e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 09:47:12 +0200 Subject: replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) instead of ignoring the returncode and truncating the string on error --- apt-pkg/contrib/strutl.cc | 15 +++++++++++++-- debian/changelog | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 1683868c8..4c05f2df8 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -67,9 +67,20 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) outbuf = new char[insize+1]; outptr = outbuf; - iconv(cd, &inptr, &insize, &outptr, &outsize); - *outptr = '\0'; + while (insize != 0) + { + size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize); + if (err == (size_t)(-1)) + { + insize--; + outsize++; + inptr++; + *outptr = '?'; + outptr++; + } + } + *outptr = '\0'; *dest = outbuf; delete[] outbuf; diff --git a/debian/changelog b/debian/changelog index 349c95038..34691b1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.24) UNRELEASED; urgency=low - simplify the makefiles needed for po4a manpages * apt-pkg/contrib/configuration.cc: - add a helper to easily get a vector of strings from the config + * apt-pkg/contrib/strutl.cc: + - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 6da747804c63f103f431706af80f793b86c41993 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 14:27:17 +0200 Subject: doc/apt-get.8.xml: fix two little typos in the --simulate description. (half-closes #545059) --- debian/changelog | 2 ++ doc/apt-get.8.xml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 34691b1fb..3d8dc292a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add a helper to easily get a vector of strings from the config * apt-pkg/contrib/strutl.cc: - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) + * doc/apt-get.8.xml: + - fix two little typos in the --simulate description. -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index b87e17247..3a1292198 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -384,9 +384,9 @@ Configuration Item: APT::Get::Simulate. Simulation run as user will deactivate locking (Debug::NoLocking) - automatical. Also a notice will be displayed indicating that this is only a simulation, - if the option APT::Get::Show-User-Simulation-Note is set (Default: true) - Neigther NoLocking nor the notice will be triggered if run as root (root should know what + automatic. Also a notice will be displayed indicating that this is only a simulation, + if the option APT::Get::Show-User-Simulation-Note is set (Default: true). + Neither NoLocking nor the notice will be triggered if run as root (root should know what he is doing without further warnings by apt-get). Simulate prints out -- cgit v1.2.3-70-g09d2 From 8bd02d8bd6bc46bc38924635afc09fdde50b6bf5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 15:02:15 +0200 Subject: Rework the CompressionTypes system by adding an Order subgroup to simplify customisation of the order and improve the documentation about this setting group. --- apt-pkg/aptconfiguration.cc | 56 +++++++++++++++++++++++++++----------------- debian/changelog | 3 +++ doc/apt.conf.5.xml | 32 ++++++++++++++++++------- doc/examples/configure-index | 9 +++++++ 4 files changed, 69 insertions(+), 31 deletions(-) (limited to 'debian') diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 1a8e8262f..45ae9bed5 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -14,6 +14,7 @@ #include #include +#include /*}}}*/ namespace APT { // getCompressionTypes - Return Vector of usbale compressiontypes /*{{{*/ @@ -29,41 +30,52 @@ const Configuration::getCompressionTypes(bool const &Cached) { types.clear(); } + // setup the defaults for the compressiontypes => method mapping + _config->CndSet("Acquire::CompressionTypes::bz2","bzip2"); + _config->CndSet("Acquire::CompressionTypes::lzma","lzma"); + _config->CndSet("Acquire::CompressionTypes::gz","gzip"); + // Set default application paths to check for optional compression types _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma"); _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2"); - ::Configuration::Item const *Opts = _config->Tree("Acquire::CompressionTypes"); - if (Opts != 0) - Opts = Opts->Child; + // accept non-list order as override setting for config settings on commandline + std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order",""); + if (overrideOrder.empty() == false) + types.push_back(overrideOrder); - // at first, move over the options to setup at least the default options - bool foundLzma=false, foundBzip2=false, foundGzip=false; - for (; Opts != 0; Opts = Opts->Next) { - if (Opts->Value == "lzma") - foundLzma = true; - else if (Opts->Value == "bz2") - foundBzip2 = true; - else if (Opts->Value == "gz") - foundGzip = true; + // load the order setting into our vector + std::vector const order = _config->FindVector("Acquire::CompressionTypes::Order"); + for (std::vector::const_iterator o = order.begin(); + o != order.end(); o++) { + if ((*o).empty() == true) + continue; + // ignore types we have no method ready to use + if (_config->Exists(string("Acquire::CompressionTypes::").append(*o)) == false) + continue; + // ignore types we have no app ready to use + string const appsetting = string("Dir::Bin::").append(*o); + if (_config->Exists(appsetting) == true) { + std::string const app = _config->FindFile(appsetting.c_str(), ""); + if (app.empty() == false && FileExists(app) == false) + continue; + } + types.push_back(*o); } - // setup the defaults now - if (!foundBzip2) - _config->Set("Acquire::CompressionTypes::bz2","bzip2"); - if (!foundLzma) - _config->Set("Acquire::CompressionTypes::lzma","lzma"); - if (!foundGzip) - _config->Set("Acquire::CompressionTypes::gz","gzip"); - - // move again over the option tree to finially calculate our result + // move again over the option tree to add all missing compression types ::Configuration::Item const *Types = _config->Tree("Acquire::CompressionTypes"); if (Types != 0) Types = Types->Child; for (; Types != 0; Types = Types->Next) { + if (Types->Tag == "Order" || Types->Tag.empty() == true) + continue; + // ignore types we already have in the vector + if (std::find(types.begin(),types.end(),Types->Tag) != types.end()) + continue; + // ignore types we have no app ready to use string const appsetting = string("Dir::Bin::").append(Types->Value); - // ignore compression types we have no app ready to use if (appsetting.empty() == false && _config->Exists(appsetting) == true) { std::string const app = _config->FindFile(appsetting.c_str(), ""); if (app.empty() == false && FileExists(app) == false) diff --git a/debian/changelog b/debian/changelog index 3d8dc292a..5ddd84117 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.7.24) UNRELEASED; urgency=low - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) * doc/apt-get.8.xml: - fix two little typos in the --simulate description. + * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: + - add an order subgroup to the compression types to simplify reordering + a bit and improve the documentation for this option group. -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e0ce0db40..92ac5ec04 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -90,7 +90,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; #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 - specified element and all its descendents are erased. + specified element and all its descendants are erased. All of the APT tools take a -o option which allows an arbitrary configuration directive to be specified on the command line. The syntax is a full option @@ -312,16 +312,30 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; CompressionTypes List of compression types which are understood by the acquire methods. Files like Packages can be available in various compression formats. - This list defines in which order the acquire methods will try to download these files. - Per default bzip2 compressed files will be prefered over - lzma, gzip and uncompressed files. The syntax for - the configuration fileentry is + Per default the acquire methods can decompress bzip2, lzma + and gzip compressed files, with this setting more formats can be added + on the fly or the used method can be changed. The syntax for this is: Acquire::CompressionTypes::FileExtension "Methodname"; - e.g. Acquire::CompressionTypes::bz2 "bzip2"; - Note that at runtime the Dir::Bin::Methodname will + Also the Order subgroup can be used to define in which order + the acquire system will try to download the compressed files. The acquire system will try the first + and proceed with the next compression type in this list on error, so to prefer one over the other type + simple add the preferred type at first - not already added default types will be added at run time + to the end of the list, so e.g. Acquire::CompressionTypes::Order:: "gz"; can + be used to prefer gzip compressed files over bzip2 and lzma. + If lzma should be preferred over gzip and bzip2 the + configure setting should look like this Acquire::CompressionTypes::Order { "lzma"; "gz"; }; + It is not needed to add bz2 explicit to the list as it will be added automatic. + Note that at run time the Dir::Bin::Methodname will be checked: If this setting exists the method will only be used if this file exists, e.g. for - the bzip2 method above (the inbuilt) setting is Dir::Bin::bzip2 "/bin/bzip2"; - + the bzip2 method (the inbuilt) setting is Dir::Bin::bzip2 "/bin/bzip2"; + Note also that list entries specified on the commandline will be added at the end of the list + specified in the configuration files, but before the default entries. To prefer a type in this case + over the ones specified in in the configuration files you can set the option direct - not in list style. + This will not override the defined list, it will only prefix the list with this type. + While it is possible to add an empty compression type to the order list, but APT in its current + version doesn't understand it correctly and will display many warnings about not downloaded files - + these warnings are most of the time false negatives. Future versions will maybe include a way to + really prefer uncompressed files to support the usage of local mirrors. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 5dc7b5246..8025fa4b4 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -246,6 +246,15 @@ Acquire { Options {"--ignore-time-conflict";} // not very useful on a normal system }; + + CompressionTypes + { + bz2 "bzip2"; + lzma "lzma"; + gz "gzip"; + + Order { "gz"; "lzma"; "bz2"; }; + }; }; // Directory layout -- cgit v1.2.3-70-g09d2 From 1221c3a38f9962ea7ac866eb507fdd798481b5d4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 17:43:47 +0200 Subject: doc/apt.ent: move the description of files to globally usable entities --- debian/changelog | 2 ++ doc/apt-cache.8.xml | 17 ++------------ doc/apt-get.8.xml | 49 +++++----------------------------------- doc/apt.conf.5.xml | 10 +-------- doc/apt.ent | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 68 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5ddd84117..c5a786919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.24) UNRELEASED; urgency=low * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: - add an order subgroup to the compression types to simplify reordering a bit and improve the documentation for this option group. + * doc/apt.ent, all man pages: + - move the description of files to globally usable entities -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 8b76f55b9..26d55a519 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -357,21 +357,8 @@ Reverse Provides: Files - /etc/apt/sources.list - Locations to fetch packages from. - Configuration Item: Dir::Etc::SourceList. - - - &statedir;/lists/ - Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: Dir::State::Lists. - - - &statedir;/lists/partial/ - Storage area for state information in transit. - Configuration Item: Dir::State::Lists (implicit partial). - + &file-sourceslist; + &file-statelists; diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 3a1292198..ec773edeb 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -558,50 +558,11 @@ Files - /etc/apt/sources.list - Locations to fetch packages from. - Configuration Item: Dir::Etc::SourceList. - - - /etc/apt/apt.conf - APT configuration file. - Configuration Item: Dir::Etc::Main. - - - /etc/apt/apt.conf.d/ - APT configuration file fragments. - Configuration Item: Dir::Etc::Parts. - - - /etc/apt/preferences - Version preferences file. - This is where you would specify "pinning", - i.e. a preference to get certain packages - from a separate source - or from a different version of a distribution. - Configuration Item: Dir::Etc::Preferences. - - - &cachedir;/archives/ - Storage area for retrieved package files. - Configuration Item: Dir::Cache::Archives. - - - &cachedir;/archives/partial/ - Storage area for package files in transit. - Configuration Item: Dir::Cache::Archives (implicit partial). - - - &statedir;/lists/ - Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: Dir::State::Lists. - - - &statedir;/lists/partial/ - Storage area for state information in transit. - Configuration Item: Dir::State::Lists (implicit partial). - + &file-sourceslist; + &file-aptconf; + &file-preferences; + &file-cachearchives; + &file-statelists; diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 92ac5ec04..81be753f9 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -858,15 +858,7 @@ is commented. Files - /etc/apt/apt.conf - APT configuration file. - Configuration Item: Dir::Etc::Main. - - - /etc/apt/apt.conf.d/ - APT configuration file fragments. - Configuration Item: Dir::Etc::Parts. - + &file-aptconf; diff --git a/doc/apt.ent b/doc/apt.ent index 43ac2f8e5..9a4c17bcd 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -289,3 +289,67 @@ "> +/etc/apt/apt.conf + APT configuration file. + Configuration Item: Dir::Etc::Main. + + + /etc/apt/apt.conf.d/ + APT configuration file fragments. + Configuration Item: Dir::Etc::Parts. + +"> + +&cachedir;/archives/ + Storage area for retrieved package files. + Configuration Item: Dir::Cache::Archives. + + + &cachedir;/archives/partial/ + Storage area for package files in transit. + Configuration Item: Dir::Cache::Archives (implicit partial). + +"> + +/etc/apt/preferences + Version preferences file. + This is where you would specify "pinning", + i.e. a preference to get certain packages + from a separate source + or from a different version of a distribution. + Configuration Item: Dir::Etc::Preferences. + + + /etc/apt/preferences.d/ + File fragments for the version preferences. + Configuration Item: Dir::Etc::PreferencesParts. + +"> + +/etc/apt/sources.list + Locations to fetch packages from. + Configuration Item: Dir::Etc::SourceList. + + + /etc/apt/sources.list.d/ + File fragments for locations to fetch packages from. + Configuration Item: Dir::Etc::SourceParts. + +"> + +&statedir;/lists/ + Storage area for state information for each package resource specified in + &sources-list; + Configuration Item: Dir::State::Lists. + + + &statedir;/lists/partial/ + Storage area for state information in transit. + Configuration Item: Dir::State::Lists (implicit partial). + +"> -- cgit v1.2.3-70-g09d2 From daa4aa525a9d0de9a9a64be59615fc4be044bb83 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 17:47:59 +0200 Subject: document the new preferences.d folder in apt_preferences(Closes: #544017) --- debian/changelog | 2 ++ doc/apt_preferences.5.xml | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c5a786919..eebef40ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ apt (0.7.24) UNRELEASED; urgency=low a bit and improve the documentation for this option group. * doc/apt.ent, all man pages: - move the description of files to globally usable entities + * doc/apt_preferences.5.xml: + - document the new preferences.d folder (Closes: #544017) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 12ea606b7..159d61f2b 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -32,7 +32,8 @@ Description The APT preferences file /etc/apt/preferences -can be used to control which versions of packages will be selected +and the fragment files in the /etc/apt/preferences.d/ +folder can be used to control which versions of packages will be selected for installation. Several versions of a package may be available for installation when @@ -610,6 +611,13 @@ apt-get install package/sid + +Files + + &file-preferences; + + + See Also &apt-get; &apt-cache; &apt-conf; &sources-list; -- cgit v1.2.3-70-g09d2 From ebf2e25b204195892b6c4866b1517755efb590b4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 23:11:11 +0200 Subject: add text at the top without failing in rred (Closes: #545694) Patch from Bernhard R. Link, thanks! --- debian/changelog | 2 ++ methods/rred.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eebef40ff..9aa1f6860 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ apt (0.7.24) UNRELEASED; urgency=low - move the description of files to globally usable entities * doc/apt_preferences.5.xml: - document the new preferences.d folder (Closes: #544017) + * methods/rred.cc: + - add at the top without failing (by Bernhard R. Link, Closes: #545694) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/methods/rred.cc b/methods/rred.cc index 6fa57f3a6..27d95bdde 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -174,7 +174,7 @@ int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, hash); /* read the rest from infile */ - if (result > 0) { + if (result >= 0) { while (fgets(buffer, BUF_SIZE, in_file) != NULL) { written = fwrite(buffer, 1, strlen(buffer), out_file); hash->Add((unsigned char*)buffer, written); -- cgit v1.2.3-70-g09d2 From 453c7548fefd3c13927cb8a10e16cca121eb144b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 14:08:40 +0200 Subject: add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) --- buildlib/sizetable | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/buildlib/sizetable b/buildlib/sizetable index b5782360c..372ddd091 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -11,6 +11,7 @@ # The format is:- # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 +amd64 little 1 4 2 8 armeb big 1 4 2 4 arm little 1 4 2 4 alpha little 1 4 2 8 @@ -21,4 +22,4 @@ m68k big 1 4 2 4 powerpc big 1 4 2 4 mips big 1 4 2 4 hppa big 1 4 2 4 -m32r big 1 4 2 4 \ No newline at end of file +m32r big 1 4 2 4 diff --git a/debian/changelog b/debian/changelog index 9aa1f6860..c308c05aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ apt (0.7.24) UNRELEASED; urgency=low - document the new preferences.d folder (Closes: #544017) * methods/rred.cc: - add at the top without failing (by Bernhard R. Link, Closes: #545694) + * buildlib/sizetable: + - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 159cf2bd7513b4bfa4e8da0526f3562f8610db67 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 14:15:33 +0200 Subject: debian/prerm: remove file as nobody will upgrade from 0.4.10 anymore --- debian/changelog | 2 ++ debian/prerm | 15 --------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100755 debian/prerm (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c308c05aa..6b4b41478 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add at the top without failing (by Bernhard R. Link, Closes: #545694) * buildlib/sizetable: - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) + * debian/prerm: + - remove file as nobody will upgrade from 0.4.10 anymore -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index 4a8d47782..000000000 --- a/debian/prerm +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/sh - -set -e - -#DEBHELPER# - -if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] && - dpkg --compare-versions "$2" "<<" 0.4.10 -then - if [ ! -d /var/state/apt/ ]; then - ln -s /var/lib/apt /var/state/apt - touch /var/lib/apt/lists/partial/.delete-me-later - fi -fi - -- cgit v1.2.3-70-g09d2 From 388b9071a956d0a5fbf6ffa4fdef8c3bb1f755cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 15:26:11 +0200 Subject: remove the suggestion on gnome-apt as it was removed from debian see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=414526 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b5cedbe2e..41620d3cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) * debian/prerm: - remove file as nobody will upgrade from 0.4.10 anymore + * debian/control: + - remove gnome-apt suggestion as it was removed from debian [ Christian Perrier ] * doc/fr/*, doc/po/fr.po: diff --git a/debian/control b/debian/control index bcf89da9b..a9c82f9e8 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt +Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. -- cgit v1.2.3-70-g09d2 From 3e9c4f702ed45f6201bae44b628c84db69436b05 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 13 Sep 2009 00:32:35 +0200 Subject: add and document experimental options to make aggressive use of dpkg's trigger and configuration handling (Closes: #473461) Add NoTriggers option to add --no-triggers to all dpkg calls, NoConfiguration to prevent apt from trying to configure packages - dpkg should handle this in the last ConfigurePending call. This options are for now deactivated as they require more testing in real world situations, but the plan is to enable them in the near future if anything works well. --- apt-pkg/deb/dpkgpm.cc | 39 +++++-- apt-pkg/deb/dpkgpm.h | 2 +- debian/changelog | 3 + doc/apt.conf.5.xml | 46 ++++++++ doc/examples/configure-index | 15 ++- doc/po/apt-doc.pot | 229 +++++++++++++++++++++++++++------------- doc/po/fr.po | 230 +++++++++++++++++++++++++++------------- doc/po/ja.po | 243 +++++++++++++++++++++++++++++-------------- po/apt-all.pot | 26 ++--- 9 files changed, 589 insertions(+), 244 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index b4a2abcb5..04e257b1b 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -134,8 +134,11 @@ bool pkgDPkgPM::Configure(PkgIterator Pkg) { if (Pkg.end() == true) return false; - - List.push_back(Item(Item::Configure,Pkg)); + + bool static const NoConfigure = _config->FindB("DPkg::NoConfigure",false); + if (NoConfigure == false) + List.push_back(Item(Item::Configure,Pkg)); + return true; } /*}}}*/ @@ -190,6 +193,9 @@ bool pkgDPkgPM::SendV2Pkgs(FILE *F) // Write out the package actions in order. for (vector::iterator I = List.begin(); I != List.end(); I++) { + if(I->Pkg.end() == true) + continue; + pkgDepCache::StateCache &S = Cache[I->Pkg]; fprintf(F,"%s ",I->Pkg.Name()); @@ -629,6 +635,11 @@ bool pkgDPkgPM::Go(int OutStatusFd) if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false) return false; + // support subpressing of triggers processing for special + // cases like d-i that runs the triggers handling manually + if(_config->FindB("DPkg::ConfigurePending",_config->FindB("DPkg::NoConfigure",false)) == true) + List.push_back(Item(Item::ConfigurePending,PkgIterator())); + // map the dpkg states to the operations that are performed // (this is sorted in the same way as Item::Ops) static const struct DpkgState DpkgStatesOpMap[][7] = { @@ -666,6 +677,9 @@ bool pkgDPkgPM::Go(int OutStatusFd) // and the PackageOpsTranslations (human readable strings) for (vector::const_iterator I = List.begin(); I != List.end();I++) { + if((*I).Pkg.end() == true) + continue; + string const name = (*I).Pkg.Name(); PackageOpsDone[name] = 0; for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++) @@ -752,11 +766,16 @@ bool pkgDPkgPM::Go(int OutStatusFd) case Item::Configure: Args[n++] = "--configure"; - if (NoTriggers == true) - Args[n++] = "--no-triggers"; Size += strlen(Args[n-1]); break; - + + case Item::ConfigurePending: + Args[n++] = "--configure"; + Size += strlen(Args[n-1]); + Args[n++] = "--pending"; + Size += strlen(Args[n-1]); + break; + case Item::Install: Args[n++] = "--unpack"; Size += strlen(Args[n-1]); @@ -764,7 +783,13 @@ bool pkgDPkgPM::Go(int OutStatusFd) Size += strlen(Args[n-1]); break; } - + + if (NoTriggers == true && I->Op != Item::ConfigurePending) + { + Args[n++] = "--no-triggers"; + Size += strlen(Args[n-1]); + } + // Write in the file or package names if (I->Op == Item::Install) { @@ -780,6 +805,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) { for (;I != J && Size < MaxArgBytes; I++) { + if((*I).Pkg.end() == true) + continue; Args[n++] = I->Pkg.Name(); Size += strlen(Args[n-1]); } diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index ebc7e32bf..0c266605a 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -53,7 +53,7 @@ class pkgDPkgPM : public pkgPackageManager struct Item { - enum Ops {Install, Configure, Remove, Purge} Op; + enum Ops {Install, Configure, Remove, Purge, ConfigurePending} Op; string File; PkgIterator Pkg; Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op), diff --git a/debian/changelog b/debian/changelog index 41620d3cb..44d39b6aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,9 @@ apt (0.7.24) UNRELEASED; urgency=low - remove file as nobody will upgrade from 0.4.10 anymore * debian/control: - remove gnome-apt suggestion as it was removed from debian + * apt-pkg/deb/dpkgpm.cc: + - add and document experimental options to make aggressive + use of dpkg's trigger and configuration handling (Closes: #473461) [ Christian Perrier ] * doc/fr/*, doc/po/fr.po: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 81be753f9..89de8ea4e 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -464,6 +464,52 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; the default is to disable signing and produce all binaries. + + dpkg trigger usage + APT can call dpkg in a way so it can make aggressive use of triggers over + multiply calls of dpkg. Without further options dpkg will use triggers only in between his + own run. Activating these options can therefore descrease the time needed to perform the + install / upgrade. Note that it is intended to activate these options per default in the + future, but as it changes the way apt calling dpkg drastical it needs a lot more testing. + These options are therefore currently experimental and should not be used in + productive environments. Also it breaks the progress reporting so all frontends will + currently stay around half (or more) of the time in the 100% state while it actually configures + all packages. + If you have understand the current risks and problems with these options, but want + to help testing them create a new configuration file with the following three options activated. + Please report any bugs and problems you encounter and make sure to note that you have used + these options in the reports. Asking dpkg for help could also be useful for debugging proposes, + see e.g. dpkg --audit. +DPkg::NoTriggers "true"; +DPkg::NoConfigure "true"; +DPkg::ConfigurePending "true"; + + + + NoTriggers + Add the no triggers flag to all dpkg calls (expect the ConfigurePending call). + See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the + triggers then this flag is present unless it is explicit called to do so in an extra call. + Note that this option exists (undocumented) also in older apt versions with a slightly different + meaning: Previously these option only append --no-triggers to the configure calls to dpkg - + now apt will add these flag also to the unpack and remove calls. + + NoConfigure + Set this option to true will prevent apt to call explicit the configuration + for all packages. The packages will only be called to unpack (or remove), so dpkg can handle the + configuration process. Activating this option will implicit activate also the next option per + default as otherwise the system could end in an unconfigured status which could be unbootable! + + + ConfigurePending + If this option is set apt will call dpkg --configure --pending + to let dpkg handle all required configurations and triggers. This option is activated automatic + per default if NoConfigure is set, but deactivating could be useful + if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you should + deactivate this option in all but the last run. + + + diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 8025fa4b4..27118fb7e 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -319,18 +319,25 @@ DSelect CheckDir "no"; } -DPkg +DPkg { + // let apt aggressivly use dpkg triggers + NoTriggers "true"; + NoConfigure "true"; + ConfigurePending "true"; + // Probably don't want to use force-downgrade.. Options {"--force-overwrite";"--force-downgrade";} - + // Auto re-mounting of a readonly /usr Pre-Invoke {"mount -o remount,rw /usr";}; Post-Invoke {"mount -o remount,ro /usr";}; - + + Chroot-Directory "/"; + // Prevents daemons from getting cwd as something mountable (default) Run-Directory "/"; - + // Build options for apt-get source --compile Build-Options "-b -uc"; diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 338ff4d53..526488a1c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-09 14:58+0300\n" +"POT-Creation-Date: 2009-09-12 12:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1408,7 +1408,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:859 apt_preferences.5.xml:615 +#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:905 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1418,7 +1418,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:865 apt_preferences.5.xml:622 sources.list.5.xml:221 +#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 sources.list.5.xml:221 msgid "See Also" msgstr "" @@ -2673,7 +2673,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:853 apt_preferences.5.xml:462 sources.list.5.xml:181 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 sources.list.5.xml:181 msgid "Examples" msgstr "" @@ -4988,13 +4988,102 @@ msgid "" "default is to disable signing and produce all binaries." msgstr "" +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt.conf.5.xml:468 +msgid "dpkg trigger usage" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:469 +msgid "" +"APT can call dpkg in a way so it can make aggressive use of triggers over " +"multiply calls of dpkg. Without further options dpkg will use triggers only " +"in between his own run. Activating these options can therefore descrease the " +"time needed to perform the install / upgrade. Note that it is intended to " +"activate these options per default in the future, but as it changes the way " +"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"options are therefore currently experimental and should not be used in " +"productive environments.</emphasis> Also it breaks the progress reporting so " +"all frontends will currently stay around half (or more) of the time in the " +"100% state while it actually configures all packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><literallayout> +#: apt.conf.5.xml:483 +#, no-wrap +msgid "" +"DPkg::NoTriggers \"true\";\n" +"DPkg::NoConfigure \"true\";\n" +"DPkg::ConfigurePending \"true\";" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:478 +msgid "" +"If you have understand the current risks and problems with these options, " +"but want to help testing them create a new configuration file with the " +"following three options activated. Please report any bugs and problems you " +"encounter and make sure to note that you have used these options in the " +"reports. Asking dpkg for help could also be useful for debugging proposes, " +"see e.g. <command>dpkg --audit</command>. <placeholder " +"type=\"literallayout\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:489 +msgid "NoTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:490 +msgid "" +"Add the no triggers flag to all dpkg calls (expect the ConfigurePending " +"call). See &dpkg; if you are interested in what this actually means. In " +"short: dpkg will not run the triggers then this flag is present unless it is " +"explicit called to do so in an extra call. Note that this option exists " +"(undocumented) also in older apt versions with a slightly different meaning: " +"Previously these option only append --no-triggers to the configure calls to " +"dpkg - now apt will add these flag also to the unpack and remove calls." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:497 +msgid "NoConfigure" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:498 +msgid "" +"Set this option to true will prevent apt to call explicit the configuration " +"for all packages. The packages will only be called to unpack (or remove), so " +"dpkg can handle the configuration process. Activating this option will " +"implicit activate also the next option per default as otherwise the system " +"could end in an unconfigured status which could be unbootable!" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:504 +msgid "ConfigurePending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:505 +msgid "" +"If this option is set apt will call <command>dpkg --configure " +"--pending</command> to let dpkg handle all required configurations and " +"triggers. This option is activated automatic per default if " +"<literal>NoConfigure</literal> is set, but deactivating could be useful if " +"you want to run APT multiple times in a row - e.g. in an installer. In this " +"sceneries you should deactivate this option in all but the last run." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:516 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:517 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5003,12 +5092,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:525 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:527 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5019,7 +5108,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:538 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5027,7 +5116,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:546 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5035,7 +5124,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:555 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5045,110 +5134,110 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:563 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:573 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:578 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:582 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:543 +#: apt.conf.5.xml:589 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:593 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:600 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:604 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:611 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:615 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:622 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:580 +#: apt.conf.5.xml:626 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:633 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:637 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:644 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:601 +#: apt.conf.5.xml:647 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:654 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:657 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:618 +#: apt.conf.5.xml:664 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:667 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5156,92 +5245,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:675 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:678 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:640 +#: apt.conf.5.xml:686 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:690 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:697 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:700 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:707 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:710 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:718 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:722 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:729 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:733 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:740 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:744 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:751 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:708 +#: apt.conf.5.xml:754 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5251,12 +5340,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:719 +#: apt.conf.5.xml:765 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:768 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5274,90 +5363,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:787 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:790 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:800 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:811 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:818 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:822 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:784 +#: apt.conf.5.xml:830 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:834 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:841 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:799 +#: apt.conf.5.xml:845 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:855 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:817 +#: apt.conf.5.xml:863 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:866 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5365,32 +5454,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:874 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:878 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:900 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:907 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:912 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 71327d583..ce0596a46 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-09-09 14:58+0300\n" +"POT-Creation-Date: 2009-09-12 12:51+0300\n" "PO-Revision-Date: 2009-09-04 20:23+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1882,7 +1882,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:859 apt_preferences.5.xml:615 +#: apt.conf.5.xml:905 apt_preferences.5.xml:615 msgid "Files" msgstr "Fichiers" @@ -1895,7 +1895,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:865 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "Voir aussi" @@ -3481,7 +3481,7 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:853 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "Exemples" @@ -6793,14 +6793,104 @@ msgstr "" "paquets ; par défaut la signature est désactivée et tous les binaires sont " "créés." +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt.conf.5.xml:468 +msgid "dpkg trigger usage" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:469 +msgid "" +"APT can call dpkg in a way so it can make aggressive use of triggers over " +"multiply calls of dpkg. Without further options dpkg will use triggers only " +"in between his own run. Activating these options can therefore descrease the " +"time needed to perform the install / upgrade. Note that it is intended to " +"activate these options per default in the future, but as it changes the way " +"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"options are therefore currently experimental and should not be used in " +"productive environments.</emphasis> Also it breaks the progress reporting so " +"all frontends will currently stay around half (or more) of the time in the " +"100% state while it actually configures all packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><literallayout> +#: apt.conf.5.xml:483 +#, no-wrap +msgid "" +"DPkg::NoTriggers \"true\";\n" +"DPkg::NoConfigure \"true\";\n" +"DPkg::ConfigurePending \"true\";" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:478 +msgid "" +"If you have understand the current risks and problems with these options, " +"but want to help testing them create a new configuration file with the " +"following three options activated. Please report any bugs and problems you " +"encounter and make sure to note that you have used these options in the " +"reports. Asking dpkg for help could also be useful for debugging proposes, " +"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout" +"\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:489 +msgid "NoTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:490 +msgid "" +"Add the no triggers flag to all dpkg calls (expect the ConfigurePending " +"call). See &dpkg; if you are interested in what this actually means. In " +"short: dpkg will not run the triggers then this flag is present unless it is " +"explicit called to do so in an extra call. Note that this option exists " +"(undocumented) also in older apt versions with a slightly different meaning: " +"Previously these option only append --no-triggers to the configure calls to " +"dpkg - now apt will add these flag also to the unpack and remove calls." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:497 +#, fuzzy +msgid "NoConfigure" +msgstr "Immediate-Configure" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:498 +msgid "" +"Set this option to true will prevent apt to call explicit the configuration " +"for all packages. The packages will only be called to unpack (or remove), so " +"dpkg can handle the configuration process. Activating this option will " +"implicit activate also the next option per default as otherwise the system " +"could end in an unconfigured status which could be unbootable!" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:504 +msgid "ConfigurePending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:505 +msgid "" +"If this option is set apt will call <command>dpkg --configure --pending</" +"command> to let dpkg handle all required configurations and triggers. This " +"option is activated automatic per default if <literal>NoConfigure</literal> " +"is set, but deactivating could be useful if you want to run APT multiple " +"times in a row - e.g. in an installer. In this sceneries you should " +"deactivate this option in all but the last run." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:516 #, fuzzy msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:517 #, fuzzy msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " @@ -6813,13 +6903,13 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:525 #, fuzzy msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:527 #, fuzzy msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " @@ -6838,7 +6928,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:538 #, fuzzy msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " @@ -6850,7 +6940,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:546 #, fuzzy msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " @@ -6862,7 +6952,7 @@ msgstr "" "<literal>apt-get -s install</literal>) sans être « root »." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:555 #, fuzzy msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " @@ -6875,7 +6965,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:563 #, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " @@ -6885,71 +6975,71 @@ msgstr "" "type statfs dans les ID de cédérom." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:573 #, fuzzy msgid "A full list of debugging options to apt follows." msgstr "Voici une liste complète des options de débogage de APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:578 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "Debug::Acquire::cdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:582 #, fuzzy msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "Affiche les informations concernant les sources de type cdrom://" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:543 +#: apt.conf.5.xml:589 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "Debug::Acquire::ftp" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:593 #, fuzzy msgid "Print information related to downloading packages using FTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:600 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "Debug::Acquire::http" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:604 #, fuzzy msgid "Print information related to downloading packages using HTTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:611 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "Debug::Acquire::https" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:615 #, fuzzy msgid "Print information related to downloading packages using HTTPS." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:622 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "Debug::Acquire::gpgv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:580 +#: apt.conf.5.xml:626 #, fuzzy msgid "" "Print information related to verifying cryptographic signatures using " @@ -6959,13 +7049,13 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:633 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "Debug::aptcdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:637 #, fuzzy msgid "" "Output information about the process of accessing collections of packages " @@ -6975,13 +7065,13 @@ msgstr "" "stockées sur cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:644 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "Debug::BuildDeps" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:601 +#: apt.conf.5.xml:647 #, fuzzy msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" @@ -6989,13 +7079,13 @@ msgstr "" "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:654 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "Debug::Hashes" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:657 #, fuzzy msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" @@ -7005,13 +7095,13 @@ msgstr "" "librairies APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:618 +#: apt.conf.5.xml:664 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "Debug::IdentCdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:667 #, fuzzy msgid "" "Do not include information from <literal>statfs</literal>, namely the number " @@ -7023,13 +7113,13 @@ msgstr "" "sur le système de fichier du cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:675 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "Debug::NoLocking" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:678 #, fuzzy msgid "" "Disable all file locking. For instance, this will allow two instances of " @@ -7039,13 +7129,13 @@ msgstr "" "deux instances de « apt-get update » en même temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:640 +#: apt.conf.5.xml:686 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "Debug::pkgAcquire" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:690 #, fuzzy msgid "Log when items are added to or removed from the global download queue." msgstr "" @@ -7053,13 +7143,13 @@ msgstr "" "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:697 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "Debug::pkgAcquire::Auth" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:700 #, fuzzy msgid "" "Output status messages and errors related to verifying checksums and " @@ -7070,13 +7160,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "Debug::pkgAcquire::Diffs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:710 #, fuzzy msgid "" "Output information about downloading and applying package index list diffs, " @@ -7087,13 +7177,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "Debug::pkgAcquire::RRed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:722 #, fuzzy msgid "" "Output information related to patching apt package lists when downloading " @@ -7104,13 +7194,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "Debug::pkgAcquire::Worker" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:733 #, fuzzy msgid "" "Log all interactions with the sub-processes that actually perform downloads." @@ -7119,13 +7209,13 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "Debug::pkgAcquire::pkgAutoRemove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:744 #, fuzzy msgid "" "Log events related to the automatically-installed status of packages and to " @@ -7135,13 +7225,13 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:708 +#: apt.conf.5.xml:754 #, fuzzy msgid "" "Generate debug messages describing which packages are being automatically " @@ -7157,13 +7247,13 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:719 +#: apt.conf.5.xml:765 #, fuzzy msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:768 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7180,13 +7270,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:787 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "Debug::pkgInitConfig" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:790 #, fuzzy msgid "Dump the default configuration to standard error on startup." msgstr "" @@ -7194,13 +7284,13 @@ msgstr "" "standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:797 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "Debug::pkgDPkgPM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:800 #, fuzzy msgid "" "When invoking &dpkg;, output the precise command line with which it is being " @@ -7210,13 +7300,13 @@ msgstr "" "arguments sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:808 #, fuzzy msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "Debug::pkgDPkgProgressReporting" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:811 #, fuzzy msgid "" "Output all the data received from &dpkg; on the status file descriptor and " @@ -7227,13 +7317,13 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:818 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "Debug::pkgOrderList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:822 #, fuzzy msgid "" "Generate a trace of the algorithm that decides the order in which " @@ -7243,38 +7333,38 @@ msgstr "" "APT passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:784 +#: apt.conf.5.xml:830 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "Debug::pkgPackageManager" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:834 #, fuzzy msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:841 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "Debug::pkgPolicy" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:799 +#: apt.conf.5.xml:845 #, fuzzy msgid "Output the priority of each package list on startup." msgstr "Au lancement, affiche la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:851 #, fuzzy msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:855 #, fuzzy msgid "" "Trace the execution of the dependency resolver (this applies only to what " @@ -7284,13 +7374,13 @@ msgstr "" "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:817 +#: apt.conf.5.xml:863 #, fuzzy msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:866 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7298,13 +7388,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:874 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "Debug::sourceList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:878 #, fuzzy msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." @@ -7314,7 +7404,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:900 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@ -7324,7 +7414,7 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:907 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7332,7 +7422,7 @@ msgstr "&apt-conf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:912 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/ja.po b/doc/po/ja.po index 5458d85ff..1e09006f9 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-09 14:58+0300\n" +"POT-Creation-Date: 2009-09-12 12:51+0300\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1928,7 +1928,7 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:859 apt_preferences.5.xml:615 +#: apt.conf.5.xml:905 apt_preferences.5.xml:615 msgid "Files" msgstr "ファイル" @@ -1942,7 +1942,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:865 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "関連項目" @@ -3630,7 +3630,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:853 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "サンプル" @@ -6851,13 +6851,106 @@ msgstr "" "これらのオプションは、パッケージのコンパイル時に &dpkg-buildpackage; に渡され" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt.conf.5.xml:468 +msgid "dpkg trigger usage" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:469 +msgid "" +"APT can call dpkg in a way so it can make aggressive use of triggers over " +"multiply calls of dpkg. Without further options dpkg will use triggers only " +"in between his own run. Activating these options can therefore descrease the " +"time needed to perform the install / upgrade. Note that it is intended to " +"activate these options per default in the future, but as it changes the way " +"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"options are therefore currently experimental and should not be used in " +"productive environments.</emphasis> Also it breaks the progress reporting so " +"all frontends will currently stay around half (or more) of the time in the " +"100% state while it actually configures all packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><literallayout> +#: apt.conf.5.xml:483 +#, no-wrap +msgid "" +"DPkg::NoTriggers \"true\";\n" +"DPkg::NoConfigure \"true\";\n" +"DPkg::ConfigurePending \"true\";" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:478 +msgid "" +"If you have understand the current risks and problems with these options, " +"but want to help testing them create a new configuration file with the " +"following three options activated. Please report any bugs and problems you " +"encounter and make sure to note that you have used these options in the " +"reports. Asking dpkg for help could also be useful for debugging proposes, " +"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout" +"\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:489 +msgid "NoTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:490 +msgid "" +"Add the no triggers flag to all dpkg calls (expect the ConfigurePending " +"call). See &dpkg; if you are interested in what this actually means. In " +"short: dpkg will not run the triggers then this flag is present unless it is " +"explicit called to do so in an extra call. Note that this option exists " +"(undocumented) also in older apt versions with a slightly different meaning: " +"Previously these option only append --no-triggers to the configure calls to " +"dpkg - now apt will add these flag also to the unpack and remove calls." +msgstr "" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:497 +#, fuzzy +msgid "NoConfigure" +msgstr "config-files" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:498 +msgid "" +"Set this option to true will prevent apt to call explicit the configuration " +"for all packages. The packages will only be called to unpack (or remove), so " +"dpkg can handle the configuration process. Activating this option will " +"implicit activate also the next option per default as otherwise the system " +"could end in an unconfigured status which could be unbootable!" +msgstr "" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:504 +#, fuzzy +msgid "ConfigurePending" +msgstr "ユーザの設定" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:505 +msgid "" +"If this option is set apt will call <command>dpkg --configure --pending</" +"command> to let dpkg handle all required configurations and triggers. This " +"option is activated automatic per default if <literal>NoConfigure</literal> " +"is set, but deactivating could be useful if you want to run APT multiple " +"times in a row - e.g. in an installer. In this sceneries you should " +"deactivate this option in all but the last run." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:516 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:517 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6871,12 +6964,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:525 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:527 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6887,7 +6980,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:538 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6898,7 +6991,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:546 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6909,7 +7002,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:555 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -6919,66 +7012,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:563 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:573 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:578 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:582 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:543 +#: apt.conf.5.xml:589 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:593 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:600 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:604 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:611 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:615 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:622 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:580 +#: apt.conf.5.xml:626 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -6986,46 +7079,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:633 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:637 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:644 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:601 +#: apt.conf.5.xml:647 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:654 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:657 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:618 +#: apt.conf.5.xml:664 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:667 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7033,93 +7126,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:675 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:678 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:640 +#: apt.conf.5.xml:686 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:690 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:697 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:700 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:707 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:710 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:718 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:722 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:729 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:733 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:740 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:744 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:751 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:708 +#: apt.conf.5.xml:754 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7129,12 +7222,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:719 +#: apt.conf.5.xml:765 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:768 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7151,91 +7244,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:787 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:790 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:800 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:811 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:818 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:822 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:784 +#: apt.conf.5.xml:830 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:834 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:841 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:799 +#: apt.conf.5.xml:845 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:855 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:817 +#: apt.conf.5.xml:863 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:866 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7243,12 +7336,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:874 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:878 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7256,7 +7349,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:900 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7266,7 +7359,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:907 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7275,7 +7368,7 @@ msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:912 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -9863,11 +9956,6 @@ msgstr "&apt-cache; &apt-conf;" #~ msgid "Operation failed" #~ msgstr "オプション" -# type: Content of: <refentry><refnamediv><refname> -#, fuzzy -#~ msgid "Config-Item" -#~ msgstr "config-files" - # type: <tag></tag> #, fuzzy #~ msgid "Single-Instance" @@ -9893,11 +9981,6 @@ msgstr "&apt-cache; &apt-conf;" #~ msgid "Version string for the method" #~ msgstr "ユーザの設定" -# type: Content of: <refentry><refsect1><title> -#, fuzzy -#~ msgid "601 Configuration" -#~ msgstr "ユーザの設定" - #, fuzzy #~ msgid "Notes" #~ msgstr "contents" diff --git a/po/apt-all.pot b/po/apt-all.pot index a037df160..d4b0d2542 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2666,12 +2666,12 @@ msgstr "" msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:655 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:662 #, c-format msgid "Removing %s" msgstr "" @@ -2681,56 +2681,56 @@ msgstr "" msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:546 +#: apt-pkg/deb/dpkgpm.cc:554 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:635 +#: apt-pkg/deb/dpkgpm.cc:648 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:636 +#: apt-pkg/deb/dpkgpm.cc:649 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:641 +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:643 +#: apt-pkg/deb/dpkgpm.cc:656 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:648 +#: apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:650 +#: apt-pkg/deb/dpkgpm.cc:663 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:655 +#: apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:656 +#: apt-pkg/deb/dpkgpm.cc:669 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:820 +#: apt-pkg/deb/dpkgpm.cc:849 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:848 +#: apt-pkg/deb/dpkgpm.cc:877 msgid "Running dpkg" msgstr "" -- cgit v1.2.3-70-g09d2 From 5e312de78360736fa3ef505909ef84da211362ca Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 15 Sep 2009 23:52:04 +0200 Subject: Add even more config options and try to handle configuration problems arising if we upgrade essential or predependencies which need to be configured before even unpacking packages depending on them. --- apt-pkg/deb/dpkgpm.cc | 28 +++-- apt-pkg/deb/dpkgpm.h | 2 +- apt-pkg/orderlist.cc | 74 ++++++++---- apt-pkg/packagemanager.cc | 37 ++++-- debian/changelog | 4 +- doc/apt.conf.5.xml | 81 ++++++++++--- doc/po/apt-doc.pot | 293 +++++++++++++++++++++++++++++---------------- doc/po/fr.po | 296 +++++++++++++++++++++++++++++---------------- doc/po/ja.po | 299 ++++++++++++++++++++++++++++++---------------- po/apt-all.pot | 30 ++--- 10 files changed, 760 insertions(+), 384 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 04e257b1b..5edab5ac7 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -135,9 +135,12 @@ bool pkgDPkgPM::Configure(PkgIterator Pkg) if (Pkg.end() == true) return false; - bool static const NoConfigure = _config->FindB("DPkg::NoConfigure",false); - if (NoConfigure == false) - List.push_back(Item(Item::Configure,Pkg)); + List.push_back(Item(Item::Configure, Pkg)); + + // Use triggers for config calls if we configure "smart" + // as otherwise Pre-Depends will not be satisfied, see #526774 + if (_config->FindB("DPkg::TriggersPending", false) == true) + List.push_back(Item(Item::TriggersPending, PkgIterator())); return true; } @@ -627,7 +630,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); unsigned int const MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); - bool const NoTriggers = _config->FindB("DPkg::NoTriggers",false); + bool const NoTriggers = _config->FindB("DPkg::NoTriggers", false); + bool const NoConfTriggers = _config->FindB("DPkg::NoConfTriggers", NoTriggers); if (RunScripts("DPkg::Pre-Invoke") == false) return false; @@ -637,8 +641,9 @@ bool pkgDPkgPM::Go(int OutStatusFd) // support subpressing of triggers processing for special // cases like d-i that runs the triggers handling manually - if(_config->FindB("DPkg::ConfigurePending",_config->FindB("DPkg::NoConfigure",false)) == true) - List.push_back(Item(Item::ConfigurePending,PkgIterator())); + bool const SmartConf = (_config->Find("PackageManager::Configure", "all") != "all"); + if (_config->FindB("DPkg::ConfigurePending", SmartConf) == true) + List.push_back(Item(Item::ConfigurePending, PkgIterator())); // map the dpkg states to the operations that are performed // (this is sorted in the same way as Item::Ops) @@ -776,6 +781,13 @@ bool pkgDPkgPM::Go(int OutStatusFd) Size += strlen(Args[n-1]); break; + case Item::TriggersPending: + Args[n++] = "--triggers-only"; + Size += strlen(Args[n-1]); + Args[n++] = "--pending"; + Size += strlen(Args[n-1]); + break; + case Item::Install: Args[n++] = "--unpack"; Size += strlen(Args[n-1]); @@ -784,7 +796,9 @@ bool pkgDPkgPM::Go(int OutStatusFd) break; } - if (NoTriggers == true && I->Op != Item::ConfigurePending) + if (NoTriggers == true && I->Op != Item::TriggersPending && + I->Op != Item::ConfigurePending && + (I->Op != Item::Configure || NoConfTriggers == true)) { Args[n++] = "--no-triggers"; Size += strlen(Args[n-1]); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 0c266605a..43e5c7d45 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -53,7 +53,7 @@ class pkgDPkgPM : public pkgPackageManager struct Item { - enum Ops {Install, Configure, Remove, Purge, ConfigurePending} Op; + enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op; string File; PkgIterator Pkg; Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op), diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 01b150722..e5bd8247d 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -174,22 +174,35 @@ bool pkgOrderList::DoRun() bool pkgOrderList::OrderCritical() { FileList = 0; - + Primary = &pkgOrderList::DepUnPackPre; Secondary = 0; RevDepends = 0; Remove = 0; LoopCount = 0; - + // Sort Me = this; - qsort(List,End - List,sizeof(*List),&OrderCompareB); - + qsort(List,End - List,sizeof(*List),&OrderCompareB); + if (DoRun() == false) return false; - + if (LoopCount != 0) return _error->Error("Fatal, predepends looping detected"); + + if (Debug == true) + { + clog << "** Critical Unpack ordering done" << endl; + + for (iterator I = List; I != End; I++) + { + PkgIterator P(Cache,*I); + if (IsNow(P) == true) + clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; + } + } + return true; } /*}}}*/ @@ -205,7 +218,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) if (FileList != 0) { WipeFlags(After); - + // Set the inlist flag for (iterator I = List; I != End; I++) { @@ -214,7 +227,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) Flag(*I,After); } } - + Primary = &pkgOrderList::DepUnPackCrit; Secondary = &pkgOrderList::DepConfigure; RevDepends = &pkgOrderList::DepUnPackDep; @@ -225,11 +238,16 @@ bool pkgOrderList::OrderUnpack(string *FileList) Me = this; qsort(List,End - List,sizeof(*List),&OrderCompareA); - if (Debug == true) - clog << "** Pass A" << endl; - if (DoRun() == false) - return false; - + if (_config->Find("PackageManager::Configure","all") == "all") + { + if (Debug == true) + clog << "** Pass A" << endl; + if (DoRun() == false) + return false; + } + else if (Debug == true) + clog << "** Skip A (same as B for non-all Configure)" << endl; + if (Debug == true) clog << "** Pass B" << endl; Secondary = 0; @@ -243,7 +261,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) Remove = 0; // Otherwise the libreadline remove problem occures if (DoRun() == false) return false; - + if (Debug == true) clog << "** Pass D" << endl; LoopCount = 0; @@ -259,9 +277,9 @@ bool pkgOrderList::OrderUnpack(string *FileList) { PkgIterator P(Cache,*I); if (IsNow(P) == true) - clog << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; + clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; } - } + } return true; } @@ -286,29 +304,35 @@ bool pkgOrderList::OrderConfigure() /* Higher scores order earlier */ int pkgOrderList::Score(PkgIterator Pkg) { + static int const ScoreDelete = _config->FindI("OrderList::Score::Delete", 500); + // Removal is always done first if (Cache[Pkg].Delete() == true) - return 200; - + return ScoreDelete; + // This should never happen.. if (Cache[Pkg].InstVerIter(Cache).end() == true) return -1; - + + static int const ScoreEssential = _config->FindI("OrderList::Score::Essential", 200); + static int const ScoreImmediate = _config->FindI("OrderList::Score::Immediate", 10); + static int const ScorePreDepends = _config->FindI("OrderList::Score::PreDepends", 50); + int Score = 0; if ((Pkg->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) - Score += 100; + Score += ScoreEssential; if (IsFlag(Pkg,Immediate) == true) - Score += 10; - - for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); + Score += ScoreImmediate; + + for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); D.end() == false; D++) if (D->Type == pkgCache::Dep::PreDepends) { - Score += 50; + Score += ScorePreDepends; break; } - + // Important Required Standard Optional Extra signed short PrioMap[] = {0,5,4,3,1,0}; if (Cache[Pkg].InstVerIter(Cache)->Priority <= 5) @@ -386,6 +410,7 @@ int pkgOrderList::OrderCompareA(const void *a, const void *b) int ScoreA = Me->Score(A); int ScoreB = Me->Score(B); + if (ScoreA > ScoreB) return -1; @@ -422,6 +447,7 @@ int pkgOrderList::OrderCompareB(const void *a, const void *b) int ScoreA = Me->Score(A); int ScoreB = Me->Score(B); + if (ScoreA > ScoreB) return -1; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index cc9ce21c7..442143516 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -57,7 +57,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, if (CreateOrderList() == false) return false; - if (List->OrderUnpack() == false) + bool const ordering = + _config->FindB("PackageManager::UnpackAll",true) ? + List->OrderUnpack() : List->OrderCritical(); + if (ordering == false) return _error->Error("Internal ordering error"); for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++) @@ -163,7 +166,7 @@ bool pkgPackageManager::CreateOrderList() delete List; List = new pkgOrderList(&Cache); - bool NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true); + static bool const NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true); // Generate the list of affected packages and sort it for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) @@ -266,13 +269,16 @@ bool pkgPackageManager::ConfigureAll() if (OList.OrderConfigure() == false) return false; - + + std::string const conf = _config->Find("PackageManager::Configure","all"); + bool const ConfigurePkgs = (conf == "all"); + // Perform the configuring for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++) { PkgIterator Pkg(Cache,*I); - if (Configure(Pkg) == false) + if (ConfigurePkgs == true && Configure(Pkg) == false) return false; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); @@ -291,16 +297,20 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg) if (DepAdd(OList,Pkg) == false) return false; - - if (OList.OrderConfigure() == false) - return false; - + + static std::string const conf = _config->Find("PackageManager::Configure","all"); + static bool const ConfigurePkgs = (conf == "all" || conf == "smart"); + + if (ConfigurePkgs == true) + if (OList.OrderConfigure() == false) + return false; + // Perform the configuring for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++) { PkgIterator Pkg(Cache,*I); - if (Configure(Pkg) == false) + if (ConfigurePkgs == true && Configure(Pkg) == false) return false; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); @@ -577,9 +587,12 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() Reset(); if (Debug == true) - clog << "Begining to order" << endl; + clog << "Beginning to order" << endl; - if (List->OrderUnpack(FileNames) == false) + bool const ordering = + _config->FindB("PackageManager::UnpackAll",true) ? + List->OrderUnpack(FileNames) : List->OrderCritical(); + if (ordering == false) { _error->Error("Internal ordering error"); return Failed; @@ -632,7 +645,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() return Failed; DoneSomething = true; } - + // Final run through the configure phase if (ConfigureAll() == false) return Failed; diff --git a/debian/changelog b/debian/changelog index 44d39b6aa..6a880144f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,8 +39,8 @@ apt (0.7.24) UNRELEASED; urgency=low - remove file as nobody will upgrade from 0.4.10 anymore * debian/control: - remove gnome-apt suggestion as it was removed from debian - * apt-pkg/deb/dpkgpm.cc: - - add and document experimental options to make aggressive + * apt-pkg/deb/dpkgpm.cc, apt-pkg/packagemanager.cc, apt-pkg/orderlist.cc: + - add and document _experimental_ options to make (aggressive) use of dpkg's trigger and configuration handling (Closes: #473461) [ Christian Perrier ] diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 89de8ea4e..808c852a5 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -465,28 +465,30 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </varlistentry> </variablelist> - <refsect2><title>dpkg trigger usage + dpkg trigger usage (and related options) APT can call dpkg in a way so it can make aggressive use of triggers over multiply calls of dpkg. Without further options dpkg will use triggers only in between his - own run. Activating these options can therefore descrease the time needed to perform the + own run. Activating these options can therefore decrease the time needed to perform the install / upgrade. Note that it is intended to activate these options per default in the - future, but as it changes the way apt calling dpkg drastical it needs a lot more testing. + future, but as it changes the way APT calling dpkg drastical it needs a lot more testing. These options are therefore currently experimental and should not be used in productive environments. Also it breaks the progress reporting so all frontends will currently stay around half (or more) of the time in the 100% state while it actually configures all packages. - If you have understand the current risks and problems with these options, but want - to help testing them create a new configuration file with the following three options activated. - Please report any bugs and problems you encounter and make sure to note that you have used - these options in the reports. Asking dpkg for help could also be useful for debugging proposes, - see e.g. dpkg --audit. + Note that it is not garanteed that APT will support these options or that these options will + not cause (big) trouble in the future. If you have understand the current risks and problems with + these options, but are brave enough to help testing them create a new configuration file and test a + combination of options. Please report any bugs, problems and improvements you encounter and make sure + to note which options you have used in your reports. Asking dpkg for help could also be useful for + debugging proposes, see e.g. dpkg --audit. A defensive option combination would be DPkg::NoTriggers "true"; -DPkg::NoConfigure "true"; -DPkg::ConfigurePending "true"; - +PackageManager::Configure "smart"; +DPkg::ConfigurePending "true"; +DPkg::TriggersPending "true"; +OrderList::Score::Immediate 100; - NoTriggers + DPkg::NoTriggers Add the no triggers flag to all dpkg calls (expect the ConfigurePending call). See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the triggers then this flag is present unless it is explicit called to do so in an extra call. @@ -494,20 +496,61 @@ DPkg::ConfigurePending "true"; meaning: Previously these option only append --no-triggers to the configure calls to dpkg - now apt will add these flag also to the unpack and remove calls. - NoConfigure - Set this option to true will prevent apt to call explicit the configuration - for all packages. The packages will only be called to unpack (or remove), so dpkg can handle the - configuration process. Activating this option will implicit activate also the next option per + PackageManager::Configure + Valid values are "all", "smart" and "no". + "all" is the default value and causes APT to configure all packages explicit. + The "smart" way is it to configure only packages which need to be configured before + another package can be unpacked (Pre-Depends) and let the rest configure by dpkg with a call generated + by the next option. "no" on the other hand will not configure anything and totally + relay on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered). + Setting this option to another than the all value will implicit activate also the next option per default as otherwise the system could end in an unconfigured status which could be unbootable! - ConfigurePending + DPkg::ConfigurePending If this option is set apt will call dpkg --configure --pending to let dpkg handle all required configurations and triggers. This option is activated automatic - per default if NoConfigure is set, but deactivating could be useful - if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you should + per default if the previous option is not set to all, but deactivating could be useful + if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you could deactivate this option in all but the last run. + DPkg::TriggersPending + Useful for smart configuration as a package which has pending + triggers is not considered as installed and dpkg treats them as unpacked + currently which is a dealbreaker for Pre-Dependencies (see debbugs #526774). Note that this will + process all triggers, not only the triggers needed to configure this package. + + Dpkg::NoConfTriggers + DPkg currently will ignore the --triggers or --no-triggers flag if the trigger + is already pending. This option therefore has no real effect as long as dpkg doesn't change + his behavior. The option is automatical activated if DPkg::NoTriggers is + activated. You should use DPkg::TriggersPending to take care of these pending + triggers. + + PackageManager::UnpackAll + As the configuration can be deferred to be done at the end by dpkg it can be + tried to order the unpack series only by critical needs, e.g. by Pre-Depends. Default is true + and therefore the "old" method of ordering in verious steps by everything. While both method + were present in earlier APT versions the OrderCritical method was unused, so + this method is very experimental and needs further improvements before becoming really useful. + + + OrderList::Score::Immediate + Essential packages (and there dependencies) should be configured immediately + after unpacking. It will be a good idea to do this quite early in the upgrade process as these + these configure calls require currently also DPkg::TriggersPending which + will run quite a few triggers (which maybe not needed). Essentials get per default a high score + but the immediate flag is relativly low (a package which has a Pre-Depends is higher rated). + These option and the others in the same group can be used to change the scoring. The following + example shows the settings with there default values. + OrderList::Score { + Delete 500; + Essential 200; + Immediate 10; + PreDepends 50; +}; + + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 526488a1c..6a54450c4 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-12 12:51+0300\n" +"POT-Creation-Date: 2009-09-15 22:56+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1408,7 +1408,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:905 apt_preferences.5.xml:615 +#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:948 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1418,7 +1418,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 sources.list.5.xml:221 +#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:954 apt_preferences.5.xml:622 sources.list.5.xml:221 msgid "See Also" msgstr "" @@ -2673,7 +2673,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 sources.list.5.xml:181 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:942 apt_preferences.5.xml:462 sources.list.5.xml:181 msgid "Examples" msgstr "" @@ -4990,7 +4990,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt.conf.5.xml:468 -msgid "dpkg trigger usage" +msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -4998,10 +4998,10 @@ msgstr "" msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " -"in between his own run. Activating these options can therefore descrease the " +"in between his own run. Activating these options can therefore decrease the " "time needed to perform the install / upgrade. Note that it is intended to " "activate these options per default in the future, but as it changes the way " -"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"APT calling dpkg drastical it needs a lot more testing. <emphasis>These " "options are therefore currently experimental and should not be used in " "productive environments.</emphasis> Also it breaks the progress reporting so " "all frontends will currently stay around half (or more) of the time in the " @@ -5009,33 +5009,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:484 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" -"DPkg::NoConfigure \"true\";\n" -"DPkg::ConfigurePending \"true\";" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";\n" +"OrderList::Score::Immediate 100;" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:478 msgid "" -"If you have understand the current risks and problems with these options, " -"but want to help testing them create a new configuration file with the " -"following three options activated. Please report any bugs and problems you " -"encounter and make sure to note that you have used these options in the " +"Note that it is not garanteed that APT will support these options or that " +"these options will not cause (big) trouble in the future. If you have " +"understand the current risks and problems with these options, but are brave " +"enough to help testing them create a new configuration file and test a " +"combination of options. Please report any bugs, problems and improvements " +"you encounter and make sure to note which options you have used in your " "reports. Asking dpkg for help could also be useful for debugging proposes, " -"see e.g. <command>dpkg --audit</command>. <placeholder " -"type=\"literallayout\" id=\"0\"/>" +"see e.g. <command>dpkg --audit</command>. A defensive option combination " +"would be <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:489 -msgid "NoTriggers" +#: apt.conf.5.xml:491 +msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:492 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5047,43 +5051,130 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:497 -msgid "NoConfigure" +#: apt.conf.5.xml:499 +msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 -msgid "" -"Set this option to true will prevent apt to call explicit the configuration " -"for all packages. The packages will only be called to unpack (or remove), so " -"dpkg can handle the configuration process. Activating this option will " -"implicit activate also the next option per default as otherwise the system " -"could end in an unconfigured status which could be unbootable!" +#: apt.conf.5.xml:500 +msgid "" +"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " +"value and causes APT to configure all packages explicit. The " +"\"<literal>smart</literal>\" way is it to configure only packages which need " +"to be configured before another package can be unpacked (Pre-Depends) and " +"let the rest configure by dpkg with a call generated by the next " +"option. \"<literal>no</literal>\" on the other hand will not configure " +"anything and totally relay on dpkg for configuration (which will at the " +"moment fail if a Pre-Depends is encountered). Setting this option to " +"another than the all value will implicit activate also the next option per " +"default as otherwise the system could end in an unconfigured status which " +"could be unbootable!" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:504 -msgid "ConfigurePending" +#: apt.conf.5.xml:510 +msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:511 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " -"triggers. This option is activated automatic per default if " -"<literal>NoConfigure</literal> is set, but deactivating could be useful if " -"you want to run APT multiple times in a row - e.g. in an installer. In this " -"sceneries you should deactivate this option in all but the last run." +"triggers. This option is activated automatic per default if the previous " +"option is not set to <literal>all</literal>, but deactivating could be " +"useful if you want to run APT multiple times in a row - e.g. in an " +"installer. In this sceneries you could deactivate this option in all but the " +"last run." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:517 +msgid "DPkg::TriggersPending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:518 +msgid "" +"Useful for <literal>smart</literal> configuration as a package which has " +"pending triggers is not considered as <literal>installed</literal> and dpkg " +"treats them as <literal>unpacked</literal> currently which is a dealbreaker " +"for Pre-Dependencies (see debbugs #526774). Note that this will process all " +"triggers, not only the triggers needed to configure this package." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:523 +msgid "Dpkg::NoConfTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:524 +msgid "" +"DPkg currently will ignore the --triggers or --no-triggers flag if the " +"trigger is already pending. This option therefore has no real effect as long " +"as dpkg doesn't change his behavior. The option is automatical activated if " +"<literal>DPkg::NoTriggers</literal> is activated. You should use " +"<literal>DPkg::TriggersPending</literal> to take care of these pending " +"triggers." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "PackageManager::UnpackAll" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:531 +msgid "" +"As the configuration can be deferred to be done at the end by dpkg it can be " +"tried to order the unpack series only by critical needs, e.g. by " +"Pre-Depends. Default is true and therefore the \"old\" method of ordering in " +"verious steps by everything. While both method were present in earlier APT " +"versions the <literal>OrderCritical</literal> method was unused, so this " +"method is very experimental and needs further improvements before becoming " +"really useful." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:538 +msgid "OrderList::Score::Immediate" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:546 +#, no-wrap +msgid "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:539 +msgid "" +"Essential packages (and there dependencies) should be configured immediately " +"after unpacking. It will be a good idea to do this quite early in the " +"upgrade process as these these configure calls require currently also " +"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers " +"(which maybe not needed). Essentials get per default a high score but the " +"immediate flag is relativly low (a package which has a Pre-Depends is higher " +"rated). These option and the others in the same group can be used to change " +"the scoring. The following example shows the settings with there default " +"values. <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:559 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:560 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5092,12 +5183,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:568 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:570 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5108,7 +5199,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:581 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5116,7 +5207,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:589 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5124,7 +5215,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:555 +#: apt.conf.5.xml:598 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5134,110 +5225,110 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:563 +#: apt.conf.5.xml:606 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:616 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:621 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:625 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:632 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:636 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:643 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:604 +#: apt.conf.5.xml:647 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:654 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:658 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:622 +#: apt.conf.5.xml:665 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:669 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:633 +#: apt.conf.5.xml:676 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:680 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:687 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:690 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:697 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:700 msgid "" "Output each cryptographic hash that is generated by the " "<literal>apt</literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:707 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:710 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5245,92 +5336,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:718 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:721 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:729 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:733 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:697 +#: apt.conf.5.xml:740 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:743 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:750 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:753 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:761 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:765 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:772 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:776 msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:783 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:787 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:794 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:797 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5340,12 +5431,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:768 +#: apt.conf.5.xml:811 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5363,90 +5454,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:830 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:833 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:840 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:843 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:854 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:861 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:865 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:873 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:877 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:884 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:845 +#: apt.conf.5.xml:888 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:898 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:863 +#: apt.conf.5.xml:906 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:909 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5454,32 +5545,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:874 +#: apt.conf.5.xml:917 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:921 msgid "" "Print information about the vendors read from " "<filename>/etc/apt/vendors.list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:900 +#: apt.conf.5.xml:943 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:907 +#: apt.conf.5.xml:950 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:912 +#: apt.conf.5.xml:955 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index ce0596a46..17ed328b1 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-09-12 12:51+0300\n" +"POT-Creation-Date: 2009-09-15 22:56+0300\n" "PO-Revision-Date: 2009-09-04 20:23+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1882,7 +1882,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:905 apt_preferences.5.xml:615 +#: apt.conf.5.xml:948 apt_preferences.5.xml:615 msgid "Files" msgstr "Fichiers" @@ -1895,7 +1895,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:954 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "Voir aussi" @@ -3481,7 +3481,7 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:942 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "Exemples" @@ -6795,7 +6795,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt.conf.5.xml:468 -msgid "dpkg trigger usage" +msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6803,10 +6803,10 @@ msgstr "" msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " -"in between his own run. Activating these options can therefore descrease the " +"in between his own run. Activating these options can therefore decrease the " "time needed to perform the install / upgrade. Note that it is intended to " "activate these options per default in the future, but as it changes the way " -"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"APT calling dpkg drastical it needs a lot more testing. <emphasis>These " "options are therefore currently experimental and should not be used in " "productive environments.</emphasis> Also it breaks the progress reporting so " "all frontends will currently stay around half (or more) of the time in the " @@ -6814,33 +6814,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:484 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" -"DPkg::NoConfigure \"true\";\n" -"DPkg::ConfigurePending \"true\";" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";\n" +"OrderList::Score::Immediate 100;" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:478 msgid "" -"If you have understand the current risks and problems with these options, " -"but want to help testing them create a new configuration file with the " -"following three options activated. Please report any bugs and problems you " -"encounter and make sure to note that you have used these options in the " +"Note that it is not garanteed that APT will support these options or that " +"these options will not cause (big) trouble in the future. If you have " +"understand the current risks and problems with these options, but are brave " +"enough to help testing them create a new configuration file and test a " +"combination of options. Please report any bugs, problems and improvements " +"you encounter and make sure to note which options you have used in your " "reports. Asking dpkg for help could also be useful for debugging proposes, " -"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout" -"\" id=\"0\"/>" +"see e.g. <command>dpkg --audit</command>. A defensive option combination " +"would be <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:489 -msgid "NoTriggers" +#: apt.conf.5.xml:491 +msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:492 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6852,45 +6856,131 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:499 #, fuzzy -msgid "NoConfigure" -msgstr "Immediate-Configure" +#| msgid "Packages::Compress" +msgid "PackageManager::Configure" +msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:500 msgid "" -"Set this option to true will prevent apt to call explicit the configuration " -"for all packages. The packages will only be called to unpack (or remove), so " -"dpkg can handle the configuration process. Activating this option will " -"implicit activate also the next option per default as otherwise the system " -"could end in an unconfigured status which could be unbootable!" +"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " +"value and causes APT to configure all packages explicit. The " +"\"<literal>smart</literal>\" way is it to configure only packages which need " +"to be configured before another package can be unpacked (Pre-Depends) and " +"let the rest configure by dpkg with a call generated by the next option. " +"\"<literal>no</literal>\" on the other hand will not configure anything and " +"totally relay on dpkg for configuration (which will at the moment fail if a " +"Pre-Depends is encountered). Setting this option to another than the all " +"value will implicit activate also the next option per default as otherwise " +"the system could end in an unconfigured status which could be unbootable!" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:504 -msgid "ConfigurePending" +#: apt.conf.5.xml:510 +msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:511 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " -"option is activated automatic per default if <literal>NoConfigure</literal> " -"is set, but deactivating could be useful if you want to run APT multiple " -"times in a row - e.g. in an installer. In this sceneries you should " -"deactivate this option in all but the last run." +"option is activated automatic per default if the previous option is not set " +"to <literal>all</literal>, but deactivating could be useful if you want to " +"run APT multiple times in a row - e.g. in an installer. In this sceneries " +"you could deactivate this option in all but the last run." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:517 +msgid "DPkg::TriggersPending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:518 +msgid "" +"Useful for <literal>smart</literal> configuration as a package which has " +"pending triggers is not considered as <literal>installed</literal> and dpkg " +"treats them as <literal>unpacked</literal> currently which is a dealbreaker " +"for Pre-Dependencies (see debbugs #526774). Note that this will process all " +"triggers, not only the triggers needed to configure this package." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:523 +msgid "Dpkg::NoConfTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:524 +msgid "" +"DPkg currently will ignore the --triggers or --no-triggers flag if the " +"trigger is already pending. This option therefore has no real effect as long " +"as dpkg doesn't change his behavior. The option is automatical activated if " +"<literal>DPkg::NoTriggers</literal> is activated. You should use " +"<literal>DPkg::TriggersPending</literal> to take care of these pending " +"triggers." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "PackageManager::UnpackAll" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:531 +msgid "" +"As the configuration can be deferred to be done at the end by dpkg it can be " +"tried to order the unpack series only by critical needs, e.g. by Pre-" +"Depends. Default is true and therefore the \"old\" method of ordering in " +"verious steps by everything. While both method were present in earlier APT " +"versions the <literal>OrderCritical</literal> method was unused, so this " +"method is very experimental and needs further improvements before becoming " +"really useful." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:538 +msgid "OrderList::Score::Immediate" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:546 +#, no-wrap +msgid "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:539 +msgid "" +"Essential packages (and there dependencies) should be configured immediately " +"after unpacking. It will be a good idea to do this quite early in the " +"upgrade process as these these configure calls require currently also " +"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers " +"(which maybe not needed). Essentials get per default a high score but the " +"immediate flag is relativly low (a package which has a Pre-Depends is higher " +"rated). These option and the others in the same group can be used to change " +"the scoring. The following example shows the settings with there default " +"values. <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:559 #, fuzzy msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:560 #, fuzzy msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " @@ -6903,13 +6993,13 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:568 #, fuzzy msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:570 #, fuzzy msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " @@ -6928,7 +7018,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:581 #, fuzzy msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " @@ -6940,7 +7030,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:589 #, fuzzy msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " @@ -6952,7 +7042,7 @@ msgstr "" "<literal>apt-get -s install</literal>) sans être « root »." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:555 +#: apt.conf.5.xml:598 #, fuzzy msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " @@ -6965,7 +7055,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:563 +#: apt.conf.5.xml:606 #, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " @@ -6975,71 +7065,71 @@ msgstr "" "type statfs dans les ID de cédérom." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:616 #, fuzzy msgid "A full list of debugging options to apt follows." msgstr "Voici une liste complète des options de débogage de APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:621 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "Debug::Acquire::cdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:625 #, fuzzy msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "Affiche les informations concernant les sources de type cdrom://" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:632 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "Debug::Acquire::ftp" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:636 #, fuzzy msgid "Print information related to downloading packages using FTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:643 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "Debug::Acquire::http" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:604 +#: apt.conf.5.xml:647 #, fuzzy msgid "Print information related to downloading packages using HTTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:654 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "Debug::Acquire::https" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:658 #, fuzzy msgid "Print information related to downloading packages using HTTPS." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:622 +#: apt.conf.5.xml:665 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "Debug::Acquire::gpgv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:669 #, fuzzy msgid "" "Print information related to verifying cryptographic signatures using " @@ -7049,13 +7139,13 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:633 +#: apt.conf.5.xml:676 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "Debug::aptcdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:680 #, fuzzy msgid "" "Output information about the process of accessing collections of packages " @@ -7065,13 +7155,13 @@ msgstr "" "stockées sur cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:687 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "Debug::BuildDeps" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:690 #, fuzzy msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" @@ -7079,13 +7169,13 @@ msgstr "" "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:697 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "Debug::Hashes" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:700 #, fuzzy msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" @@ -7095,13 +7185,13 @@ msgstr "" "librairies APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "Debug::IdentCdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:710 #, fuzzy msgid "" "Do not include information from <literal>statfs</literal>, namely the number " @@ -7113,13 +7203,13 @@ msgstr "" "sur le système de fichier du cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "Debug::NoLocking" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:721 #, fuzzy msgid "" "Disable all file locking. For instance, this will allow two instances of " @@ -7129,13 +7219,13 @@ msgstr "" "deux instances de « apt-get update » en même temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "Debug::pkgAcquire" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:733 #, fuzzy msgid "Log when items are added to or removed from the global download queue." msgstr "" @@ -7143,13 +7233,13 @@ msgstr "" "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:697 +#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "Debug::pkgAcquire::Auth" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:743 #, fuzzy msgid "" "Output status messages and errors related to verifying checksums and " @@ -7160,13 +7250,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:750 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "Debug::pkgAcquire::Diffs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:753 #, fuzzy msgid "" "Output information about downloading and applying package index list diffs, " @@ -7177,13 +7267,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:761 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "Debug::pkgAcquire::RRed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:765 #, fuzzy msgid "" "Output information related to patching apt package lists when downloading " @@ -7194,13 +7284,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:772 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "Debug::pkgAcquire::Worker" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:776 #, fuzzy msgid "" "Log all interactions with the sub-processes that actually perform downloads." @@ -7209,13 +7299,13 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:783 #, fuzzy msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "Debug::pkgAcquire::pkgAutoRemove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:787 #, fuzzy msgid "" "Log events related to the automatically-installed status of packages and to " @@ -7225,13 +7315,13 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:794 #, fuzzy msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:797 #, fuzzy msgid "" "Generate debug messages describing which packages are being automatically " @@ -7247,13 +7337,13 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:808 #, fuzzy msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:768 +#: apt.conf.5.xml:811 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7270,13 +7360,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:830 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "Debug::pkgInitConfig" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:833 #, fuzzy msgid "Dump the default configuration to standard error on startup." msgstr "" @@ -7284,13 +7374,13 @@ msgstr "" "standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:840 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "Debug::pkgDPkgPM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:843 #, fuzzy msgid "" "When invoking &dpkg;, output the precise command line with which it is being " @@ -7300,13 +7390,13 @@ msgstr "" "arguments sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:851 #, fuzzy msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "Debug::pkgDPkgProgressReporting" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:854 #, fuzzy msgid "" "Output all the data received from &dpkg; on the status file descriptor and " @@ -7317,13 +7407,13 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:861 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "Debug::pkgOrderList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:865 #, fuzzy msgid "" "Generate a trace of the algorithm that decides the order in which " @@ -7333,38 +7423,38 @@ msgstr "" "APT passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:873 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "Debug::pkgPackageManager" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:877 #, fuzzy msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:884 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "Debug::pkgPolicy" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:845 +#: apt.conf.5.xml:888 #, fuzzy msgid "Output the priority of each package list on startup." msgstr "Au lancement, affiche la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:894 #, fuzzy msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:898 #, fuzzy msgid "" "Trace the execution of the dependency resolver (this applies only to what " @@ -7374,13 +7464,13 @@ msgstr "" "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:863 +#: apt.conf.5.xml:906 #, fuzzy msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:909 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7388,13 +7478,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:874 +#: apt.conf.5.xml:917 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "Debug::sourceList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:921 #, fuzzy msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." @@ -7404,7 +7494,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:900 +#: apt.conf.5.xml:943 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@ -7414,7 +7504,7 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:907 +#: apt.conf.5.xml:950 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7422,7 +7512,7 @@ msgstr "&apt-conf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:912 +#: apt.conf.5.xml:955 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" @@ -9186,6 +9276,10 @@ msgstr "" msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" +#, fuzzy +#~ msgid "NoConfigure" +#~ msgstr "Immediate-Configure" + #~ msgid "<filename>/etc/apt/sources.list</filename>" #~ msgstr "<filename>/etc/apt/sources.list</filename>" diff --git a/doc/po/ja.po b/doc/po/ja.po index 1e09006f9..7cae35b6e 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-12 12:51+0300\n" +"POT-Creation-Date: 2009-09-15 22:56+0300\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1928,7 +1928,7 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:905 apt_preferences.5.xml:615 +#: apt.conf.5.xml:948 apt_preferences.5.xml:615 msgid "Files" msgstr "ファイル" @@ -1942,7 +1942,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:954 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "関連項目" @@ -3630,7 +3630,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:942 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "サンプル" @@ -6853,7 +6853,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt.conf.5.xml:468 -msgid "dpkg trigger usage" +msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6861,10 +6861,10 @@ msgstr "" msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " -"in between his own run. Activating these options can therefore descrease the " +"in between his own run. Activating these options can therefore decrease the " "time needed to perform the install / upgrade. Note that it is intended to " "activate these options per default in the future, but as it changes the way " -"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"APT calling dpkg drastical it needs a lot more testing. <emphasis>These " "options are therefore currently experimental and should not be used in " "productive environments.</emphasis> Also it breaks the progress reporting so " "all frontends will currently stay around half (or more) of the time in the " @@ -6872,33 +6872,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:484 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" -"DPkg::NoConfigure \"true\";\n" -"DPkg::ConfigurePending \"true\";" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";\n" +"OrderList::Score::Immediate 100;" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:478 msgid "" -"If you have understand the current risks and problems with these options, " -"but want to help testing them create a new configuration file with the " -"following three options activated. Please report any bugs and problems you " -"encounter and make sure to note that you have used these options in the " +"Note that it is not garanteed that APT will support these options or that " +"these options will not cause (big) trouble in the future. If you have " +"understand the current risks and problems with these options, but are brave " +"enough to help testing them create a new configuration file and test a " +"combination of options. Please report any bugs, problems and improvements " +"you encounter and make sure to note which options you have used in your " "reports. Asking dpkg for help could also be useful for debugging proposes, " -"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout" -"\" id=\"0\"/>" +"see e.g. <command>dpkg --audit</command>. A defensive option combination " +"would be <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:489 -msgid "NoTriggers" +#: apt.conf.5.xml:491 +msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:492 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6909,48 +6913,134 @@ msgid "" "dpkg - now apt will add these flag also to the unpack and remove calls." msgstr "" -# type: Content of: <refentry><refnamediv><refname> +# type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:499 #, fuzzy -msgid "NoConfigure" -msgstr "config-files" +#| msgid "Packages::Compress" +msgid "PackageManager::Configure" +msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:500 msgid "" -"Set this option to true will prevent apt to call explicit the configuration " -"for all packages. The packages will only be called to unpack (or remove), so " -"dpkg can handle the configuration process. Activating this option will " -"implicit activate also the next option per default as otherwise the system " -"could end in an unconfigured status which could be unbootable!" +"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " +"value and causes APT to configure all packages explicit. The " +"\"<literal>smart</literal>\" way is it to configure only packages which need " +"to be configured before another package can be unpacked (Pre-Depends) and " +"let the rest configure by dpkg with a call generated by the next option. " +"\"<literal>no</literal>\" on the other hand will not configure anything and " +"totally relay on dpkg for configuration (which will at the moment fail if a " +"Pre-Depends is encountered). Setting this option to another than the all " +"value will implicit activate also the next option per default as otherwise " +"the system could end in an unconfigured status which could be unbootable!" msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:510 #, fuzzy -msgid "ConfigurePending" +msgid "DPkg::ConfigurePending" msgstr "ユーザの設定" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:511 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " -"option is activated automatic per default if <literal>NoConfigure</literal> " -"is set, but deactivating could be useful if you want to run APT multiple " -"times in a row - e.g. in an installer. In this sceneries you should " -"deactivate this option in all but the last run." +"option is activated automatic per default if the previous option is not set " +"to <literal>all</literal>, but deactivating could be useful if you want to " +"run APT multiple times in a row - e.g. in an installer. In this sceneries " +"you could deactivate this option in all but the last run." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:517 +msgid "DPkg::TriggersPending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:518 +msgid "" +"Useful for <literal>smart</literal> configuration as a package which has " +"pending triggers is not considered as <literal>installed</literal> and dpkg " +"treats them as <literal>unpacked</literal> currently which is a dealbreaker " +"for Pre-Dependencies (see debbugs #526774). Note that this will process all " +"triggers, not only the triggers needed to configure this package." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:523 +msgid "Dpkg::NoConfTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:524 +msgid "" +"DPkg currently will ignore the --triggers or --no-triggers flag if the " +"trigger is already pending. This option therefore has no real effect as long " +"as dpkg doesn't change his behavior. The option is automatical activated if " +"<literal>DPkg::NoTriggers</literal> is activated. You should use " +"<literal>DPkg::TriggersPending</literal> to take care of these pending " +"triggers." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "PackageManager::UnpackAll" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:531 +msgid "" +"As the configuration can be deferred to be done at the end by dpkg it can be " +"tried to order the unpack series only by critical needs, e.g. by Pre-" +"Depends. Default is true and therefore the \"old\" method of ordering in " +"verious steps by everything. While both method were present in earlier APT " +"versions the <literal>OrderCritical</literal> method was unused, so this " +"method is very experimental and needs further improvements before becoming " +"really useful." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:538 +msgid "OrderList::Score::Immediate" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:546 +#, no-wrap +msgid "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:539 +msgid "" +"Essential packages (and there dependencies) should be configured immediately " +"after unpacking. It will be a good idea to do this quite early in the " +"upgrade process as these these configure calls require currently also " +"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers " +"(which maybe not needed). Essentials get per default a high score but the " +"immediate flag is relativly low (a package which has a Pre-Depends is higher " +"rated). These option and the others in the same group can be used to change " +"the scoring. The following example shows the settings with there default " +"values. <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:559 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:560 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6964,12 +7054,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:568 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:570 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6980,7 +7070,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:581 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6991,7 +7081,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:589 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7002,7 +7092,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:555 +#: apt.conf.5.xml:598 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7012,66 +7102,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:563 +#: apt.conf.5.xml:606 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:616 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:621 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:625 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:632 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:636 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:643 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:604 +#: apt.conf.5.xml:647 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:654 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:658 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:622 +#: apt.conf.5.xml:665 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:669 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7079,46 +7169,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:633 +#: apt.conf.5.xml:676 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:680 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:687 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:690 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:697 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:700 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:707 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:710 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7126,93 +7216,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:718 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:721 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:729 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:733 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:697 +#: apt.conf.5.xml:740 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:743 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:750 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:753 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:761 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:765 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:772 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:776 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:783 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:787 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:794 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:797 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7222,12 +7312,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:768 +#: apt.conf.5.xml:811 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7244,91 +7334,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:830 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:833 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:840 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:843 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:854 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:861 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:865 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:873 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:877 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:884 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:845 +#: apt.conf.5.xml:888 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:898 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:863 +#: apt.conf.5.xml:906 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:909 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7336,12 +7426,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:874 +#: apt.conf.5.xml:917 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:921 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7349,7 +7439,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:900 +#: apt.conf.5.xml:943 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7359,7 +7449,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:907 +#: apt.conf.5.xml:950 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7368,7 +7458,7 @@ msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:912 +#: apt.conf.5.xml:955 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -9122,6 +9212,11 @@ msgstr "" msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" +# type: Content of: <refentry><refnamediv><refname> +#, fuzzy +#~ msgid "NoConfigure" +#~ msgstr "config-files" + # type: Content of: <refentry><refsect1><para> #~ msgid "<filename>/etc/apt/sources.list</filename>" #~ msgstr "<filename>/etc/apt/sources.list</filename>" diff --git a/po/apt-all.pot b/po/apt-all.pot index d4b0d2542..bb3f07904 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-09 15:01+0200\n" +"POT-Creation-Date: 2009-09-15 22:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2292,7 +2292,7 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:426 +#: apt-pkg/packagemanager.cc:436 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2666,12 +2666,12 @@ msgstr "" msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:655 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:662 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 #, c-format msgid "Removing %s" msgstr "" @@ -2681,56 +2681,56 @@ msgstr "" msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:554 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:648 +#: apt-pkg/deb/dpkgpm.cc:653 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:649 +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:659 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:656 +#: apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:666 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:663 +#: apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:673 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:669 +#: apt-pkg/deb/dpkgpm.cc:674 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:849 +#: apt-pkg/deb/dpkgpm.cc:863 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:877 +#: apt-pkg/deb/dpkgpm.cc:891 msgid "Running dpkg" msgstr "" -- cgit v1.2.3-70-g09d2