Merge lp:~pitti/apt/compressed-indexes into lp:~mvo/apt/debian-sid
- compressed-indexes
- Merge into debian-sid
Status: | Merged |
---|---|
Merge reported by: | Martin Pitt |
Merged at revision: | not available |
Proposed branch: | lp:~pitti/apt/compressed-indexes |
Merge into: | lp:~mvo/apt/debian-sid |
Diff against target: |
2719 lines (+683/-326) 17 files modified
apt-pkg/acquire-item.cc (+28/-4) apt-pkg/contrib/fileutl.cc (+54/-7) apt-pkg/contrib/fileutl.h (+7/-4) apt-pkg/deb/debindexfile.cc (+29/-9) apt-pkg/deb/debrecords.cc (+1/-1) apt-pkg/deb/debsrcrecords.h (+1/-1) apt-pkg/makefile (+1/-1) cmdline/apt-cache.cc (+1/-1) configure.in (+4/-0) debian/changelog (+40/-0) debian/control (+1/-1) debian/rules (+1/-1) doc/apt.conf.5.xml (+9/-0) doc/po/apt-doc.pot (+134/-120) doc/po/de.po (+139/-120) methods/gzip.cc (+7/-56) test/test-indexes.sh (+226/-0) |
To merge this branch: | bzr merge lp:~pitti/apt/compressed-indexes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Vogt | Pending | ||
Review via email: mp+27382@code.launchpad.net |
Commit message
Description of the change
This branch introduces support for storing gzip-compressed package indexes locally. On my system, this reduces /var/lib/apt/lists/ from 70 MB to 19 MB without introducing noticeable additional latency (mostly because my hard disk is very slow, thus the additional CPU overhead of uncompressing the indexes for building the cache is more than offset by the saved I/O). But even on netbooks or thin clients with fast SSD and slow processor this is an interesting option if the install is very space constrained.
I did not enable this option by default. To use it, one needs to create a file like
$ cat /etc/apt/
Acquire:
Acquire:
The second is necessary since the patch deliberately avoids re-compressing downloaded indexes, it just keeps an already gzip compressed index if it gets one.
I also added some test cases for this in test/test-
Note that due to the stupidity of C++ this changes the ABI of libapt.
I backported the changes to lucid (with a workaround for the ABI break), and are now running with this version on my desktop (with compressed indexes). This turned up two regressions, which are now covered in the tests and fixed.
Martin Pitt (pitti) wrote : | # |
Martin Pitt (pitti) wrote : | # |
Please note that https:/
Otherwise this looks fairly stable to me now.
Preview Diff
1 | === modified file 'apt-pkg/acquire-item.cc' |
2 | --- apt-pkg/acquire-item.cc 2010-05-04 07:57:24 +0000 |
3 | +++ apt-pkg/acquire-item.cc 2010-07-06 11:16:27 +0000 |
4 | @@ -228,7 +228,7 @@ |
5 | ss >> ServerSha1 >> size; |
6 | unsigned long const ServerSize = atol(size.c_str()); |
7 | |
8 | - FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); |
9 | + FileFd fd(CurrentPackagesFile, FileFd::ReadOnlyGzip); |
10 | SHA1Summation SHA1; |
11 | SHA1.AddFD(fd.Fd(), fd.Size()); |
12 | string const local_sha1 = SHA1.Result(); |
13 | @@ -459,7 +459,7 @@ |
14 | string FinalFile = _config->FindDir("Dir::State::lists"); |
15 | FinalFile += URItoFileName(RealURI); |
16 | |
17 | - FileFd fd(FinalFile, FileFd::ReadOnly); |
18 | + FileFd fd(FinalFile, FileFd::ReadOnlyGzip); |
19 | SHA1Summation SHA1; |
20 | SHA1.AddFD(fd.Fd(), fd.Size()); |
21 | string local_sha1 = string(SHA1.Result()); |
22 | @@ -620,6 +620,8 @@ |
23 | { |
24 | string Final = _config->FindDir("Dir::State::lists"); |
25 | Final += URItoFileName(RealURI); |
26 | + if (_config->FindB("Acquire::GzipIndexes",false)) |
27 | + Final += ".gz"; |
28 | |
29 | struct stat Buf; |
30 | if (stat(Final.c_str(),&Buf) != 0) |
31 | @@ -737,18 +739,38 @@ |
32 | ErrorText = "Method gave a blank filename"; |
33 | } |
34 | |
35 | + string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); |
36 | + |
37 | // The files timestamp matches |
38 | - if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) |
39 | + if (StringToBool(LookupTag(Message,"IMS-Hit"),false) == true) { |
40 | + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz") |
41 | + // Update DestFile for .gz suffix so that the clean operation keeps it |
42 | + DestFile += ".gz"; |
43 | return; |
44 | + } |
45 | |
46 | if (FileName == DestFile) |
47 | Erase = true; |
48 | else |
49 | Local = true; |
50 | |
51 | - string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); |
52 | string decompProg; |
53 | |
54 | + // If we enable compressed indexes and already have gzip, keep it |
55 | + if (_config->FindB("Acquire::GzipIndexes",false) && compExt == "gz" && !Local) { |
56 | + string FinalFile = _config->FindDir("Dir::State::lists"); |
57 | + FinalFile += URItoFileName(RealURI) + ".gz"; |
58 | + //if(Debug) |
59 | + // std::clog << "pkgAcqIndex: keeping gzipped " << FinalFile << endl; |
60 | + Rename(DestFile,FinalFile); |
61 | + chmod(FinalFile.c_str(),0644); |
62 | + |
63 | + // Update DestFile for .gz suffix so that the clean operation keeps it |
64 | + DestFile = _config->FindDir("Dir::State::lists") + "partial/"; |
65 | + DestFile += URItoFileName(RealURI) + ".gz"; |
66 | + return; |
67 | + } |
68 | + |
69 | // get the binary name for your used compression type |
70 | decompProg = _config->Find(string("Acquire::CompressionTypes::").append(compExt),""); |
71 | if(decompProg.empty() == false); |
72 | @@ -1671,5 +1693,7 @@ |
73 | { |
74 | if (IsIndexFile) |
75 | return "\nIndex-File: true"; |
76 | + else |
77 | + return ""; |
78 | } |
79 | /*}}}*/ |
80 | |
81 | === modified file 'apt-pkg/contrib/fileutl.cc' |
82 | --- apt-pkg/contrib/fileutl.cc 2010-02-13 00:45:26 +0000 |
83 | +++ apt-pkg/contrib/fileutl.cc 2010-07-06 11:16:27 +0000 |
84 | @@ -11,6 +11,7 @@ |
85 | Most of this source is placed in the Public Domain, do with it what |
86 | you will |
87 | It was originally written by Jason Gunthorpe <jgg@debian.org>. |
88 | + FileFd gzip support added by Martin Pitt <martin.pitt@canonical.com> |
89 | |
90 | The exception is RunScripts() it is under the GPLv2 |
91 | |
92 | @@ -604,6 +605,17 @@ |
93 | case ReadOnly: |
94 | iFd = open(FileName.c_str(),O_RDONLY); |
95 | break; |
96 | + |
97 | + case ReadOnlyGzip: |
98 | + iFd = open(FileName.c_str(),O_RDONLY); |
99 | + if (iFd > 0) { |
100 | + gz = gzdopen (iFd, "r"); |
101 | + if (gz == NULL) { |
102 | + close (iFd); |
103 | + iFd = -1; |
104 | + } |
105 | + } |
106 | + break; |
107 | |
108 | case WriteEmpty: |
109 | { |
110 | @@ -658,7 +670,10 @@ |
111 | |
112 | do |
113 | { |
114 | - Res = read(iFd,To,Size); |
115 | + if (gz != NULL) |
116 | + Res = gzread(gz,To,Size); |
117 | + else |
118 | + Res = read(iFd,To,Size); |
119 | if (Res < 0 && errno == EINTR) |
120 | continue; |
121 | if (Res < 0) |
122 | @@ -697,7 +712,10 @@ |
123 | errno = 0; |
124 | do |
125 | { |
126 | - Res = write(iFd,From,Size); |
127 | + if (gz != NULL) |
128 | + Res = gzwrite(gz,From,Size); |
129 | + else |
130 | + Res = write(iFd,From,Size); |
131 | if (Res < 0 && errno == EINTR) |
132 | continue; |
133 | if (Res < 0) |
134 | @@ -723,7 +741,12 @@ |
135 | /* */ |
136 | bool FileFd::Seek(unsigned long To) |
137 | { |
138 | - if (lseek(iFd,To,SEEK_SET) != (signed)To) |
139 | + int res; |
140 | + if (gz) |
141 | + res = gzseek(gz,To,SEEK_SET); |
142 | + else |
143 | + res = lseek(iFd,To,SEEK_SET); |
144 | + if (res != (signed)To) |
145 | { |
146 | Flags |= Fail; |
147 | return _error->Error("Unable to seek to %lu",To); |
148 | @@ -737,7 +760,12 @@ |
149 | /* */ |
150 | bool FileFd::Skip(unsigned long Over) |
151 | { |
152 | - if (lseek(iFd,Over,SEEK_CUR) < 0) |
153 | + int res; |
154 | + if (gz) |
155 | + res = gzseek(gz,Over,SEEK_CUR); |
156 | + else |
157 | + res = lseek(iFd,Over,SEEK_CUR); |
158 | + if (res < 0) |
159 | { |
160 | Flags |= Fail; |
161 | return _error->Error("Unable to seek ahead %lu",Over); |
162 | @@ -751,6 +779,11 @@ |
163 | /* */ |
164 | bool FileFd::Truncate(unsigned long To) |
165 | { |
166 | + if (gz) |
167 | + { |
168 | + Flags |= Fail; |
169 | + return _error->Error("Truncating gzipped files is not implemented (%s)", FileName.c_str()); |
170 | + } |
171 | if (ftruncate(iFd,To) != 0) |
172 | { |
173 | Flags |= Fail; |
174 | @@ -765,7 +798,11 @@ |
175 | /* */ |
176 | unsigned long FileFd::Tell() |
177 | { |
178 | - off_t Res = lseek(iFd,0,SEEK_CUR); |
179 | + off_t Res; |
180 | + if (gz) |
181 | + Res = gztell(gz); |
182 | + else |
183 | + Res = lseek(iFd,0,SEEK_CUR); |
184 | if (Res == (off_t)-1) |
185 | _error->Errno("lseek","Failed to determine the current file position"); |
186 | return Res; |
187 | @@ -776,6 +813,7 @@ |
188 | /* */ |
189 | unsigned long FileFd::Size() |
190 | { |
191 | + //TODO: For gz, do we need the actual file size here or the uncompressed length? |
192 | struct stat Buf; |
193 | if (fstat(iFd,&Buf) != 0) |
194 | return _error->Errno("fstat","Unable to determine the file size"); |
195 | @@ -789,9 +827,18 @@ |
196 | { |
197 | bool Res = true; |
198 | if ((Flags & AutoClose) == AutoClose) |
199 | - if (iFd >= 0 && close(iFd) != 0) |
200 | - Res &= _error->Errno("close",_("Problem closing the file")); |
201 | + { |
202 | + if (gz != NULL) { |
203 | + int e = gzclose(gz); |
204 | + // gzdopen() on empty files always fails with "buffer error" here, ignore that |
205 | + if (e != 0 && e != Z_BUF_ERROR) |
206 | + Res &= _error->Errno("close",_("Problem closing the gzip file")); |
207 | + } else |
208 | + if (iFd > 0 && close(iFd) != 0) |
209 | + Res &= _error->Errno("close",_("Problem closing the file")); |
210 | + } |
211 | iFd = -1; |
212 | + gz = NULL; |
213 | |
214 | if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && |
215 | FileName.empty() == false) |
216 | |
217 | === modified file 'apt-pkg/contrib/fileutl.h' |
218 | --- apt-pkg/contrib/fileutl.h 2010-02-13 00:45:26 +0000 |
219 | +++ apt-pkg/contrib/fileutl.h 2010-07-06 11:16:27 +0000 |
220 | @@ -25,6 +25,8 @@ |
221 | #include <string> |
222 | #include <vector> |
223 | |
224 | +#include <zlib.h> |
225 | + |
226 | using std::string; |
227 | |
228 | class FileFd |
229 | @@ -36,9 +38,10 @@ |
230 | HitEof = (1<<3)}; |
231 | unsigned long Flags; |
232 | string FileName; |
233 | + gzFile gz; |
234 | |
235 | public: |
236 | - enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp}; |
237 | + enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp,ReadOnlyGzip}; |
238 | |
239 | inline bool Read(void *To,unsigned long Size,bool AllowEof) |
240 | { |
241 | @@ -69,12 +72,12 @@ |
242 | inline string &Name() {return FileName;}; |
243 | |
244 | FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), |
245 | - Flags(0) |
246 | + Flags(0), gz(NULL) |
247 | { |
248 | Open(FileName,Mode,Perms); |
249 | }; |
250 | - FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose) {}; |
251 | - FileFd(int Fd,bool) : iFd(Fd), Flags(0) {}; |
252 | + FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose), gz(NULL) {}; |
253 | + FileFd(int Fd,bool) : iFd(Fd), Flags(0), gz(NULL) {}; |
254 | virtual ~FileFd(); |
255 | }; |
256 | |
257 | |
258 | === modified file 'apt-pkg/deb/debindexfile.cc' |
259 | --- apt-pkg/deb/debindexfile.cc 2010-02-18 14:17:50 +0000 |
260 | +++ apt-pkg/deb/debindexfile.cc 2010-07-06 11:16:27 +0000 |
261 | @@ -63,9 +63,13 @@ |
262 | /* */ |
263 | pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const |
264 | { |
265 | - string SourcesURI = URItoFileName(IndexURI("Sources")); |
266 | - return new debSrcRecordParser(_config->FindDir("Dir::State::lists") + |
267 | - SourcesURI,this); |
268 | + string SourcesURI = _config->FindDir("Dir::State::lists") + |
269 | + URItoFileName(IndexURI("Sources")); |
270 | + string SourcesURIgzip = SourcesURI + ".gz"; |
271 | + if (!FileExists(SourcesURI) && FileExists(SourcesURIgzip)) |
272 | + SourcesURI = SourcesURIgzip; |
273 | + |
274 | + return new debSrcRecordParser(SourcesURI,this); |
275 | } |
276 | /*}}}*/ |
277 | // SourcesIndex::Describe - Give a descriptive path to the index /*{{{*/ |
278 | @@ -106,8 +110,14 @@ |
279 | /* */ |
280 | inline string debSourcesIndex::IndexFile(const char *Type) const |
281 | { |
282 | - return URItoFileName(IndexURI(Type)); |
283 | + string s = URItoFileName(IndexURI(Type)); |
284 | + string sgzip = s + ".gz"; |
285 | + if (!FileExists(s) && FileExists(sgzip)) |
286 | + return sgzip; |
287 | + else |
288 | + return s; |
289 | } |
290 | + |
291 | string debSourcesIndex::IndexURI(const char *Type) const |
292 | { |
293 | string Res; |
294 | @@ -213,7 +223,12 @@ |
295 | /* */ |
296 | inline string debPackagesIndex::IndexFile(const char *Type) const |
297 | { |
298 | - return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); |
299 | + string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); |
300 | + string sgzip = s + ".gz"; |
301 | + if (!FileExists(s) && FileExists(sgzip)) |
302 | + return sgzip; |
303 | + else |
304 | + return s; |
305 | } |
306 | string debPackagesIndex::IndexURI(const char *Type) const |
307 | { |
308 | @@ -258,7 +273,7 @@ |
309 | bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const |
310 | { |
311 | string PackageFile = IndexFile("Packages"); |
312 | - FileFd Pkg(PackageFile,FileFd::ReadOnly); |
313 | + FileFd Pkg(PackageFile,FileFd::ReadOnlyGzip); |
314 | debListParser Parser(&Pkg); |
315 | if (_error->PendingError() == true) |
316 | return _error->Error("Problem opening %s",PackageFile.c_str()); |
317 | @@ -340,7 +355,12 @@ |
318 | /* */ |
319 | inline string debTranslationsIndex::IndexFile(const char *Type) const |
320 | { |
321 | - return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); |
322 | + string s =_config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type)); |
323 | + string sgzip = s + ".gz"; |
324 | + if (!FileExists(s) && FileExists(sgzip)) |
325 | + return sgzip; |
326 | + else |
327 | + return s; |
328 | } |
329 | string debTranslationsIndex::IndexURI(const char *Type) const |
330 | { |
331 | @@ -444,7 +464,7 @@ |
332 | string TranslationFile = IndexFile(Language); |
333 | if (TranslationsAvailable() && FileExists(TranslationFile)) |
334 | { |
335 | - FileFd Trans(TranslationFile,FileFd::ReadOnly); |
336 | + FileFd Trans(TranslationFile,FileFd::ReadOnlyGzip); |
337 | debListParser TransParser(&Trans); |
338 | if (_error->PendingError() == true) |
339 | return false; |
340 | @@ -524,7 +544,7 @@ |
341 | /* */ |
342 | bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const |
343 | { |
344 | - FileFd Pkg(File,FileFd::ReadOnly); |
345 | + FileFd Pkg(File,FileFd::ReadOnlyGzip); |
346 | if (_error->PendingError() == true) |
347 | return false; |
348 | debListParser Parser(&Pkg); |
349 | |
350 | === modified file 'apt-pkg/deb/debrecords.cc' |
351 | --- apt-pkg/deb/debrecords.cc 2010-05-05 08:01:41 +0000 |
352 | +++ apt-pkg/deb/debrecords.cc 2010-07-06 11:16:27 +0000 |
353 | @@ -19,7 +19,7 @@ |
354 | // --------------------------------------------------------------------- |
355 | /* */ |
356 | debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : |
357 | - File(FileName,FileFd::ReadOnly), |
358 | + File(FileName,FileFd::ReadOnlyGzip), |
359 | Tags(&File, std::max(Cache.Head().MaxVerFileSize, |
360 | Cache.Head().MaxDescFileSize) + 200) |
361 | { |
362 | |
363 | === modified file 'apt-pkg/deb/debsrcrecords.h' |
364 | --- apt-pkg/deb/debsrcrecords.h 2009-11-28 23:23:26 +0000 |
365 | +++ apt-pkg/deb/debsrcrecords.h 2010-07-06 11:16:27 +0000 |
366 | @@ -48,7 +48,7 @@ |
367 | virtual bool Files(vector<pkgSrcRecords::File> &F); |
368 | |
369 | debSrcRecordParser(string const &File,pkgIndexFile const *Index) |
370 | - : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), |
371 | + : Parser(Index), Fd(File,FileFd::ReadOnlyGzip), Tags(&Fd,102400), |
372 | Buffer(0), BufSize(0) {} |
373 | ~debSrcRecordParser(); |
374 | }; |
375 | |
376 | === modified file 'apt-pkg/makefile' |
377 | --- apt-pkg/makefile 2010-02-13 00:45:26 +0000 |
378 | +++ apt-pkg/makefile 2010-07-06 11:16:27 +0000 |
379 | @@ -14,7 +14,7 @@ |
380 | LIBRARY=apt-pkg |
381 | MAJOR=$(LIBAPTPKG_MAJOR) |
382 | MINOR=$(LIBAPTPKG_RELEASE) |
383 | -SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl |
384 | +SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lz |
385 | APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR) |
386 | |
387 | # Source code for the contributed non-core things |
388 | |
389 | === modified file 'cmdline/apt-cache.cc' |
390 | --- cmdline/apt-cache.cc 2010-03-21 17:11:46 +0000 |
391 | +++ cmdline/apt-cache.cc 2010-07-06 11:16:27 +0000 |
392 | @@ -1220,7 +1220,7 @@ |
393 | if (I.IsOk() == false) |
394 | return _error->Error(_("Package file %s is out of sync."),I.FileName()); |
395 | |
396 | - FileFd PkgF(I.FileName(),FileFd::ReadOnly); |
397 | + FileFd PkgF(I.FileName(),FileFd::ReadOnlyGzip); |
398 | if (_error->PendingError() == true) |
399 | return false; |
400 | |
401 | |
402 | === modified file 'configure.in' |
403 | --- configure.in 2010-05-05 14:34:20 +0000 |
404 | +++ configure.in 2010-07-06 11:16:27 +0000 |
405 | @@ -83,6 +83,10 @@ |
406 | |
407 | AC_SUBST(BDBLIB) |
408 | |
409 | +AC_CHECK_LIB(z, gzopen, |
410 | + [AC_CHECK_HEADER(zlib.h, [], AC_MSG_ERROR([failed: zlib.h not found]))], |
411 | + AC_MSG_ERROR([failed: Need libz])) |
412 | + |
413 | dnl Converts the ARCH to be something singular for this general CPU family |
414 | dnl This is often the dpkg architecture string. |
415 | dnl First check against the full canonical canoncial-system-type in $target |
416 | |
417 | === modified file 'debian/changelog' |
418 | --- debian/changelog 2010-05-15 18:07:48 +0000 |
419 | +++ debian/changelog 2010-07-06 11:16:27 +0000 |
420 | @@ -1,8 +1,48 @@ |
421 | apt (0.7.26~exp5) UNRELEASED; urgency=low |
422 | |
423 | + [ Christian Perrier ] |
424 | * Slovak translation update. Closes: #581159 |
425 | * Italian translation update. Closes: #581742 |
426 | |
427 | + [ Martin Pitt ] |
428 | + * debian/rules: |
429 | + - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right |
430 | + CXXFLAGS. |
431 | + * apt-pkg/contrib/fileutl.{h,cc}: |
432 | + - Add support for reading of gzipped files with the new "ReadOnlyGzip" |
433 | + OpenMode. |
434 | + - Link against zlib (in apt-pkg/makefile) and add zlib build dependency. |
435 | + - [ABI BREAK] This adds a new private member to FileFd, but its |
436 | + initialization is in the public header file. |
437 | + * configure.in: |
438 | + - Check for zlib library and headers. |
439 | + * apt-pkg/acquire-item.cc, apt-pkg/deb/debindexfile.cc, |
440 | + apt-pkg/deb/debrecords.cc, apt-pkg/deb/debsrcrecords.h, |
441 | + cmdline/apt-cache.cc: |
442 | + - Open Packages, Sources, and Translations indexes in "ReadOnlyGzip" mode. |
443 | + * apt-pkg/deb/debindexfile.cc: |
444 | + - If we do not find uncompressed package/source/translation indexes, look |
445 | + for gzip compressed ones. |
446 | + * apt-pkg/acquire-item.cc: |
447 | + - If the Acquire::GzipIndexes option is true and we download a gzipped |
448 | + index file, keep it as it is (and rename to .gz) instead of |
449 | + uncompressing it. |
450 | + * doc/apt.conf.5.xml: |
451 | + - Document the new Acquire::GzipIndexes option. |
452 | + * doc/po/apt-doc.pot, doc/po/de.po: |
453 | + - German translation of new Acquire::GzipIndexes option. |
454 | + * Add test/test-indexes.sh: |
455 | + - Test behaviour of index retrieval and usage, in particular with |
456 | + uncompressed and gzip compressed indexes. |
457 | + * apt-pkg/acquire-item.cc: |
458 | + - Fix return value of pkgAcqFile::Custom600Headers() in the non-index |
459 | + case, to avoid returning NULL and causing crashers in callers. This also |
460 | + fixes a compiler warning. |
461 | + * methods/gzip.cc: With FileFd now being able to read gzipped files, there |
462 | + is no need for the gzip method any more to spawn an external gzip process. |
463 | + Rewrite it to use FileFd directly, which makes the code a lot simpler, and |
464 | + also using less memory and overhead. |
465 | + |
466 | -- Christian Perrier <bubulle@debian.org> Tue, 11 May 2010 19:52:00 +0200 |
467 | |
468 | apt (0.7.26~exp4) unstable; urgency=low |
469 | |
470 | === modified file 'debian/control' |
471 | --- debian/control 2010-05-05 14:34:20 +0000 |
472 | +++ debian/control 2010-07-06 11:16:27 +0000 |
473 | @@ -6,7 +6,7 @@ |
474 | Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, |
475 | Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org> |
476 | Standards-Version: 3.8.4 |
477 | -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev |
478 | +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev |
479 | Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ |
480 | |
481 | Package: apt |
482 | |
483 | === modified file 'debian/rules' |
484 | --- debian/rules 2010-05-05 14:34:20 +0000 |
485 | +++ debian/rules 2010-07-06 11:16:27 +0000 |
486 | @@ -108,7 +108,7 @@ |
487 | dh_testdir |
488 | -mkdir build |
489 | cp COPYING debian/copyright |
490 | - cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags) |
491 | + cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags) |
492 | touch $@ |
493 | |
494 | build/build-stamp: build/configure-stamp |
495 | |
496 | === modified file 'doc/apt.conf.5.xml' |
497 | --- doc/apt.conf.5.xml 2010-02-13 00:45:26 +0000 |
498 | +++ doc/apt.conf.5.xml 2010-07-06 11:16:27 +0000 |
499 | @@ -411,6 +411,15 @@ |
500 | really prefer uncompressed files to support the usage of local mirrors.</para></listitem> |
501 | </varlistentry> |
502 | |
503 | + <varlistentry><term>GzipIndexes</term> |
504 | + <listitem><para> |
505 | + When downloading <literal>gzip</literal> compressed indexes (Packages, Sources, or |
506 | + Translations), keep them gzip compressed locally instead of unpacking |
507 | + them. This saves quite a lot of disk space at the expense of more CPU |
508 | + requirements when building the local package caches. False by default. |
509 | + </para></listitem> |
510 | + </varlistentry> |
511 | + |
512 | <varlistentry><term>Languages</term> |
513 | <listitem><para>The Languages subsection controls which <filename>Translation</filename> files are downloaded |
514 | and in which order APT tries to display the Description-Translations. APT will try to display the first |
515 | |
516 | === modified file 'doc/po/apt-doc.pot' |
517 | --- doc/po/apt-doc.pot 2010-02-18 20:06:47 +0000 |
518 | +++ doc/po/apt-doc.pot 2010-07-06 11:16:27 +0000 |
519 | @@ -7,7 +7,7 @@ |
520 | msgid "" |
521 | msgstr "" |
522 | "Project-Id-Version: PACKAGE VERSION\n" |
523 | -"POT-Creation-Date: 2010-02-18 20:53+0100\n" |
524 | +"POT-Creation-Date: 2010-06-11 10:56+0300\n" |
525 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
526 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
527 | "Language-Team: LANGUAGE <LL@li.org>\n" |
528 | @@ -1284,7 +1284,7 @@ |
529 | msgstr "" |
530 | |
531 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
532 | -#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 |
533 | +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533 |
534 | msgid "options" |
535 | msgstr "" |
536 | |
537 | @@ -1482,7 +1482,7 @@ |
538 | msgstr "" |
539 | |
540 | #. type: Content of: <refentry><refsect1><title> |
541 | -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:630 |
542 | +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1044 apt_preferences.5.xml:630 |
543 | msgid "Files" |
544 | msgstr "" |
545 | |
546 | @@ -1492,7 +1492,7 @@ |
547 | msgstr "" |
548 | |
549 | #. type: Content of: <refentry><refsect1><title> |
550 | -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 sources.list.5.xml:233 |
551 | +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637 sources.list.5.xml:233 |
552 | msgid "See Also" |
553 | msgstr "" |
554 | |
555 | @@ -2806,7 +2806,7 @@ |
556 | msgstr "" |
557 | |
558 | #. type: Content of: <refentry><refsect1><title> |
559 | -#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 sources.list.5.xml:193 |
560 | +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477 sources.list.5.xml:193 |
561 | msgid "Examples" |
562 | msgstr "" |
563 | |
564 | @@ -5043,11 +5043,25 @@ |
565 | |
566 | #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> |
567 | #: apt.conf.5.xml:414 |
568 | +msgid "GzipIndexes" |
569 | +msgstr "" |
570 | + |
571 | +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> |
572 | +#: apt.conf.5.xml:416 |
573 | +msgid "" |
574 | +"When downloading <literal>gzip</literal> compressed indexes (Packages, " |
575 | +"Sources, or Translations), keep them gzip compressed locally instead of " |
576 | +"unpacking them. This saves quite a lot of disk space at the expense of more " |
577 | +"CPU requirements when building the local package caches. False by default." |
578 | +msgstr "" |
579 | + |
580 | +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> |
581 | +#: apt.conf.5.xml:423 |
582 | msgid "Languages" |
583 | msgstr "" |
584 | |
585 | #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> |
586 | -#: apt.conf.5.xml:415 |
587 | +#: apt.conf.5.xml:424 |
588 | msgid "" |
589 | "The Languages subsection controls which <filename>Translation</filename> " |
590 | "files are downloaded and in which order APT tries to display the " |
591 | @@ -5060,13 +5074,13 @@ |
592 | msgstr "" |
593 | |
594 | #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> |
595 | -#: apt.conf.5.xml:431 |
596 | +#: apt.conf.5.xml:440 |
597 | #, no-wrap |
598 | msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" |
599 | msgstr "" |
600 | |
601 | #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> |
602 | -#: apt.conf.5.xml:421 |
603 | +#: apt.conf.5.xml:430 |
604 | msgid "" |
605 | "The default list includes \"environment\" and " |
606 | "\"en\". \"<literal>environment</literal>\" has a special meaning here: It " |
607 | @@ -5097,12 +5111,12 @@ |
608 | msgstr "" |
609 | |
610 | #. type: Content of: <refentry><refsect1><title> |
611 | -#: apt.conf.5.xml:438 |
612 | +#: apt.conf.5.xml:447 |
613 | msgid "Directories" |
614 | msgstr "" |
615 | |
616 | #. type: Content of: <refentry><refsect1><para> |
617 | -#: apt.conf.5.xml:440 |
618 | +#: apt.conf.5.xml:449 |
619 | msgid "" |
620 | "The <literal>Dir::State</literal> section has directories that pertain to " |
621 | "local state information. <literal>lists</literal> is the directory to place " |
622 | @@ -5114,7 +5128,7 @@ |
623 | msgstr "" |
624 | |
625 | #. type: Content of: <refentry><refsect1><para> |
626 | -#: apt.conf.5.xml:447 |
627 | +#: apt.conf.5.xml:456 |
628 | msgid "" |
629 | "<literal>Dir::Cache</literal> contains locations pertaining to local cache " |
630 | "information, such as the two package caches <literal>srcpkgcache</literal> " |
631 | @@ -5127,7 +5141,7 @@ |
632 | msgstr "" |
633 | |
634 | #. type: Content of: <refentry><refsect1><para> |
635 | -#: apt.conf.5.xml:456 |
636 | +#: apt.conf.5.xml:465 |
637 | msgid "" |
638 | "<literal>Dir::Etc</literal> contains the location of configuration files, " |
639 | "<literal>sourcelist</literal> gives the location of the sourcelist and " |
640 | @@ -5137,7 +5151,7 @@ |
641 | msgstr "" |
642 | |
643 | #. type: Content of: <refentry><refsect1><para> |
644 | -#: apt.conf.5.xml:462 |
645 | +#: apt.conf.5.xml:471 |
646 | msgid "" |
647 | "The <literal>Dir::Parts</literal> setting reads in all the config fragments " |
648 | "in lexical order from the directory specified. After this is done then the " |
649 | @@ -5145,7 +5159,7 @@ |
650 | msgstr "" |
651 | |
652 | #. type: Content of: <refentry><refsect1><para> |
653 | -#: apt.conf.5.xml:466 |
654 | +#: apt.conf.5.xml:475 |
655 | msgid "" |
656 | "Binary programs are pointed to by " |
657 | "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " |
658 | @@ -5157,7 +5171,7 @@ |
659 | msgstr "" |
660 | |
661 | #. type: Content of: <refentry><refsect1><para> |
662 | -#: apt.conf.5.xml:474 |
663 | +#: apt.conf.5.xml:483 |
664 | msgid "" |
665 | "The configuration item <literal>RootDir</literal> has a special meaning. If " |
666 | "set, all paths in <literal>Dir::</literal> will be relative to " |
667 | @@ -5170,12 +5184,12 @@ |
668 | msgstr "" |
669 | |
670 | #. type: Content of: <refentry><refsect1><title> |
671 | -#: apt.conf.5.xml:487 |
672 | +#: apt.conf.5.xml:496 |
673 | msgid "APT in DSelect" |
674 | msgstr "" |
675 | |
676 | #. type: Content of: <refentry><refsect1><para> |
677 | -#: apt.conf.5.xml:489 |
678 | +#: apt.conf.5.xml:498 |
679 | msgid "" |
680 | "When APT is used as a &dselect; method several configuration directives " |
681 | "control the default behaviour. These are in the <literal>DSelect</literal> " |
682 | @@ -5183,12 +5197,12 @@ |
683 | msgstr "" |
684 | |
685 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
686 | -#: apt.conf.5.xml:493 |
687 | +#: apt.conf.5.xml:502 |
688 | msgid "Clean" |
689 | msgstr "" |
690 | |
691 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
692 | -#: apt.conf.5.xml:494 |
693 | +#: apt.conf.5.xml:503 |
694 | msgid "" |
695 | "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " |
696 | "and never. always and prompt will remove all packages from the cache after " |
697 | @@ -5199,50 +5213,50 @@ |
698 | msgstr "" |
699 | |
700 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
701 | -#: apt.conf.5.xml:503 |
702 | +#: apt.conf.5.xml:512 |
703 | msgid "" |
704 | "The contents of this variable is passed to &apt-get; as command line options " |
705 | "when it is run for the install phase." |
706 | msgstr "" |
707 | |
708 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
709 | -#: apt.conf.5.xml:507 |
710 | +#: apt.conf.5.xml:516 |
711 | msgid "Updateoptions" |
712 | msgstr "" |
713 | |
714 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
715 | -#: apt.conf.5.xml:508 |
716 | +#: apt.conf.5.xml:517 |
717 | msgid "" |
718 | "The contents of this variable is passed to &apt-get; as command line options " |
719 | "when it is run for the update phase." |
720 | msgstr "" |
721 | |
722 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
723 | -#: apt.conf.5.xml:512 |
724 | +#: apt.conf.5.xml:521 |
725 | msgid "PromptAfterUpdate" |
726 | msgstr "" |
727 | |
728 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
729 | -#: apt.conf.5.xml:513 |
730 | +#: apt.conf.5.xml:522 |
731 | msgid "" |
732 | "If true the [U]pdate operation in &dselect; will always prompt to continue. " |
733 | "The default is to prompt only on error." |
734 | msgstr "" |
735 | |
736 | #. type: Content of: <refentry><refsect1><title> |
737 | -#: apt.conf.5.xml:519 |
738 | +#: apt.conf.5.xml:528 |
739 | msgid "How APT calls dpkg" |
740 | msgstr "" |
741 | |
742 | #. type: Content of: <refentry><refsect1><para> |
743 | -#: apt.conf.5.xml:520 |
744 | +#: apt.conf.5.xml:529 |
745 | msgid "" |
746 | "Several configuration directives control how APT invokes &dpkg;. These are " |
747 | "in the <literal>DPkg</literal> section." |
748 | msgstr "" |
749 | |
750 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
751 | -#: apt.conf.5.xml:525 |
752 | +#: apt.conf.5.xml:534 |
753 | msgid "" |
754 | "This is a list of options to pass to dpkg. The options must be specified " |
755 | "using the list notation and each list item is passed as a single argument to " |
756 | @@ -5250,17 +5264,17 @@ |
757 | msgstr "" |
758 | |
759 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
760 | -#: apt.conf.5.xml:530 |
761 | +#: apt.conf.5.xml:539 |
762 | msgid "Pre-Invoke" |
763 | msgstr "" |
764 | |
765 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
766 | -#: apt.conf.5.xml:530 |
767 | +#: apt.conf.5.xml:539 |
768 | msgid "Post-Invoke" |
769 | msgstr "" |
770 | |
771 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
772 | -#: apt.conf.5.xml:531 |
773 | +#: apt.conf.5.xml:540 |
774 | msgid "" |
775 | "This is a list of shell commands to run before/after invoking &dpkg;. Like " |
776 | "<literal>options</literal> this must be specified in list notation. The " |
777 | @@ -5269,12 +5283,12 @@ |
778 | msgstr "" |
779 | |
780 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
781 | -#: apt.conf.5.xml:537 |
782 | +#: apt.conf.5.xml:546 |
783 | msgid "Pre-Install-Pkgs" |
784 | msgstr "" |
785 | |
786 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
787 | -#: apt.conf.5.xml:538 |
788 | +#: apt.conf.5.xml:547 |
789 | msgid "" |
790 | "This is a list of shell commands to run before invoking dpkg. Like " |
791 | "<literal>options</literal> this must be specified in list notation. The " |
792 | @@ -5284,7 +5298,7 @@ |
793 | msgstr "" |
794 | |
795 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
796 | -#: apt.conf.5.xml:544 |
797 | +#: apt.conf.5.xml:553 |
798 | msgid "" |
799 | "Version 2 of this protocol dumps more information, including the protocol " |
800 | "version, the APT configuration space and the packages, files and versions " |
801 | @@ -5295,36 +5309,36 @@ |
802 | msgstr "" |
803 | |
804 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
805 | -#: apt.conf.5.xml:551 |
806 | +#: apt.conf.5.xml:560 |
807 | msgid "Run-Directory" |
808 | msgstr "" |
809 | |
810 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
811 | -#: apt.conf.5.xml:552 |
812 | +#: apt.conf.5.xml:561 |
813 | msgid "" |
814 | "APT chdirs to this directory before invoking dpkg, the default is " |
815 | "<filename>/</filename>." |
816 | msgstr "" |
817 | |
818 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
819 | -#: apt.conf.5.xml:556 |
820 | +#: apt.conf.5.xml:565 |
821 | msgid "Build-options" |
822 | msgstr "" |
823 | |
824 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
825 | -#: apt.conf.5.xml:557 |
826 | +#: apt.conf.5.xml:566 |
827 | msgid "" |
828 | "These options are passed to &dpkg-buildpackage; when compiling packages, the " |
829 | "default is to disable signing and produce all binaries." |
830 | msgstr "" |
831 | |
832 | #. type: Content of: <refentry><refsect1><refsect2><title> |
833 | -#: apt.conf.5.xml:562 |
834 | +#: apt.conf.5.xml:571 |
835 | msgid "dpkg trigger usage (and related options)" |
836 | msgstr "" |
837 | |
838 | #. type: Content of: <refentry><refsect1><refsect2><para> |
839 | -#: apt.conf.5.xml:563 |
840 | +#: apt.conf.5.xml:572 |
841 | msgid "" |
842 | "APT can call dpkg in a way so it can make aggressive use of triggers over " |
843 | "multiply calls of dpkg. Without further options dpkg will use triggers only " |
844 | @@ -5339,7 +5353,7 @@ |
845 | msgstr "" |
846 | |
847 | #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> |
848 | -#: apt.conf.5.xml:578 |
849 | +#: apt.conf.5.xml:587 |
850 | #, no-wrap |
851 | msgid "" |
852 | "DPkg::NoTriggers \"true\";\n" |
853 | @@ -5349,7 +5363,7 @@ |
854 | msgstr "" |
855 | |
856 | #. type: Content of: <refentry><refsect1><refsect2><para> |
857 | -#: apt.conf.5.xml:572 |
858 | +#: apt.conf.5.xml:581 |
859 | msgid "" |
860 | "Note that it is not guaranteed that APT will support these options or that " |
861 | "these options will not cause (big) trouble in the future. If you have " |
862 | @@ -5363,12 +5377,12 @@ |
863 | msgstr "" |
864 | |
865 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
866 | -#: apt.conf.5.xml:584 |
867 | +#: apt.conf.5.xml:593 |
868 | msgid "DPkg::NoTriggers" |
869 | msgstr "" |
870 | |
871 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
872 | -#: apt.conf.5.xml:585 |
873 | +#: apt.conf.5.xml:594 |
874 | msgid "" |
875 | "Add the no triggers flag to all dpkg calls (except the ConfigurePending " |
876 | "call). See &dpkg; if you are interested in what this actually means. In " |
877 | @@ -5380,12 +5394,12 @@ |
878 | msgstr "" |
879 | |
880 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
881 | -#: apt.conf.5.xml:592 |
882 | +#: apt.conf.5.xml:601 |
883 | msgid "PackageManager::Configure" |
884 | msgstr "" |
885 | |
886 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
887 | -#: apt.conf.5.xml:593 |
888 | +#: apt.conf.5.xml:602 |
889 | msgid "" |
890 | "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " |
891 | "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " |
892 | @@ -5402,12 +5416,12 @@ |
893 | msgstr "" |
894 | |
895 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
896 | -#: apt.conf.5.xml:603 |
897 | +#: apt.conf.5.xml:612 |
898 | msgid "DPkg::ConfigurePending" |
899 | msgstr "" |
900 | |
901 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
902 | -#: apt.conf.5.xml:604 |
903 | +#: apt.conf.5.xml:613 |
904 | msgid "" |
905 | "If this option is set apt will call <command>dpkg --configure " |
906 | "--pending</command> to let dpkg handle all required configurations and " |
907 | @@ -5419,12 +5433,12 @@ |
908 | msgstr "" |
909 | |
910 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
911 | -#: apt.conf.5.xml:610 |
912 | +#: apt.conf.5.xml:619 |
913 | msgid "DPkg::TriggersPending" |
914 | msgstr "" |
915 | |
916 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
917 | -#: apt.conf.5.xml:611 |
918 | +#: apt.conf.5.xml:620 |
919 | msgid "" |
920 | "Useful for <literal>smart</literal> configuration as a package which has " |
921 | "pending triggers is not considered as <literal>installed</literal> and dpkg " |
922 | @@ -5434,12 +5448,12 @@ |
923 | msgstr "" |
924 | |
925 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
926 | -#: apt.conf.5.xml:616 |
927 | +#: apt.conf.5.xml:625 |
928 | msgid "PackageManager::UnpackAll" |
929 | msgstr "" |
930 | |
931 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
932 | -#: apt.conf.5.xml:617 |
933 | +#: apt.conf.5.xml:626 |
934 | msgid "" |
935 | "As the configuration can be deferred to be done at the end by dpkg it can be " |
936 | "tried to order the unpack series only by critical needs, e.g. by " |
937 | @@ -5451,12 +5465,12 @@ |
938 | msgstr "" |
939 | |
940 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
941 | -#: apt.conf.5.xml:624 |
942 | +#: apt.conf.5.xml:633 |
943 | msgid "OrderList::Score::Immediate" |
944 | msgstr "" |
945 | |
946 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> |
947 | -#: apt.conf.5.xml:632 |
948 | +#: apt.conf.5.xml:641 |
949 | #, no-wrap |
950 | msgid "" |
951 | "OrderList::Score {\n" |
952 | @@ -5468,7 +5482,7 @@ |
953 | msgstr "" |
954 | |
955 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
956 | -#: apt.conf.5.xml:625 |
957 | +#: apt.conf.5.xml:634 |
958 | msgid "" |
959 | "Essential packages (and there dependencies) should be configured immediately " |
960 | "after unpacking. It will be a good idea to do this quite early in the " |
961 | @@ -5482,12 +5496,12 @@ |
962 | msgstr "" |
963 | |
964 | #. type: Content of: <refentry><refsect1><title> |
965 | -#: apt.conf.5.xml:645 |
966 | +#: apt.conf.5.xml:654 |
967 | msgid "Periodic and Archives options" |
968 | msgstr "" |
969 | |
970 | #. type: Content of: <refentry><refsect1><para> |
971 | -#: apt.conf.5.xml:646 |
972 | +#: apt.conf.5.xml:655 |
973 | msgid "" |
974 | "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " |
975 | "of options configure behavior of apt periodic updates, which is done by " |
976 | @@ -5496,12 +5510,12 @@ |
977 | msgstr "" |
978 | |
979 | #. type: Content of: <refentry><refsect1><title> |
980 | -#: apt.conf.5.xml:654 |
981 | +#: apt.conf.5.xml:663 |
982 | msgid "Debug options" |
983 | msgstr "" |
984 | |
985 | #. type: Content of: <refentry><refsect1><para> |
986 | -#: apt.conf.5.xml:656 |
987 | +#: apt.conf.5.xml:665 |
988 | msgid "" |
989 | "Enabling options in the <literal>Debug::</literal> section will cause " |
990 | "debugging information to be sent to the standard error stream of the program " |
991 | @@ -5512,7 +5526,7 @@ |
992 | msgstr "" |
993 | |
994 | #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> |
995 | -#: apt.conf.5.xml:667 |
996 | +#: apt.conf.5.xml:676 |
997 | msgid "" |
998 | "<literal>Debug::pkgProblemResolver</literal> enables output about the " |
999 | "decisions made by <literal>dist-upgrade, upgrade, install, remove, " |
1000 | @@ -5520,7 +5534,7 @@ |
1001 | msgstr "" |
1002 | |
1003 | #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> |
1004 | -#: apt.conf.5.xml:675 |
1005 | +#: apt.conf.5.xml:684 |
1006 | msgid "" |
1007 | "<literal>Debug::NoLocking</literal> disables all file locking. This can be " |
1008 | "used to run some operations (for instance, <literal>apt-get -s " |
1009 | @@ -5528,7 +5542,7 @@ |
1010 | msgstr "" |
1011 | |
1012 | #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> |
1013 | -#: apt.conf.5.xml:684 |
1014 | +#: apt.conf.5.xml:693 |
1015 | msgid "" |
1016 | "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " |
1017 | "time that <literal>apt</literal> invokes &dpkg;." |
1018 | @@ -5538,110 +5552,110 @@ |
1019 | #. motivating example, except I haven't a clue why you'd want |
1020 | #. to do this. |
1021 | #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> |
1022 | -#: apt.conf.5.xml:692 |
1023 | +#: apt.conf.5.xml:701 |
1024 | msgid "" |
1025 | "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " |
1026 | "in CDROM IDs." |
1027 | msgstr "" |
1028 | |
1029 | #. type: Content of: <refentry><refsect1><para> |
1030 | -#: apt.conf.5.xml:702 |
1031 | +#: apt.conf.5.xml:711 |
1032 | msgid "A full list of debugging options to apt follows." |
1033 | msgstr "" |
1034 | |
1035 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1036 | -#: apt.conf.5.xml:707 |
1037 | +#: apt.conf.5.xml:716 |
1038 | msgid "<literal>Debug::Acquire::cdrom</literal>" |
1039 | msgstr "" |
1040 | |
1041 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1042 | -#: apt.conf.5.xml:711 |
1043 | +#: apt.conf.5.xml:720 |
1044 | msgid "Print information related to accessing <literal>cdrom://</literal> sources." |
1045 | msgstr "" |
1046 | |
1047 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1048 | -#: apt.conf.5.xml:718 |
1049 | +#: apt.conf.5.xml:727 |
1050 | msgid "<literal>Debug::Acquire::ftp</literal>" |
1051 | msgstr "" |
1052 | |
1053 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1054 | -#: apt.conf.5.xml:722 |
1055 | +#: apt.conf.5.xml:731 |
1056 | msgid "Print information related to downloading packages using FTP." |
1057 | msgstr "" |
1058 | |
1059 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1060 | -#: apt.conf.5.xml:729 |
1061 | +#: apt.conf.5.xml:738 |
1062 | msgid "<literal>Debug::Acquire::http</literal>" |
1063 | msgstr "" |
1064 | |
1065 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1066 | -#: apt.conf.5.xml:733 |
1067 | +#: apt.conf.5.xml:742 |
1068 | msgid "Print information related to downloading packages using HTTP." |
1069 | msgstr "" |
1070 | |
1071 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1072 | -#: apt.conf.5.xml:740 |
1073 | +#: apt.conf.5.xml:749 |
1074 | msgid "<literal>Debug::Acquire::https</literal>" |
1075 | msgstr "" |
1076 | |
1077 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1078 | -#: apt.conf.5.xml:744 |
1079 | +#: apt.conf.5.xml:753 |
1080 | msgid "Print information related to downloading packages using HTTPS." |
1081 | msgstr "" |
1082 | |
1083 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1084 | -#: apt.conf.5.xml:751 |
1085 | +#: apt.conf.5.xml:760 |
1086 | msgid "<literal>Debug::Acquire::gpgv</literal>" |
1087 | msgstr "" |
1088 | |
1089 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1090 | -#: apt.conf.5.xml:755 |
1091 | +#: apt.conf.5.xml:764 |
1092 | msgid "" |
1093 | "Print information related to verifying cryptographic signatures using " |
1094 | "<literal>gpg</literal>." |
1095 | msgstr "" |
1096 | |
1097 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1098 | -#: apt.conf.5.xml:762 |
1099 | +#: apt.conf.5.xml:771 |
1100 | msgid "<literal>Debug::aptcdrom</literal>" |
1101 | msgstr "" |
1102 | |
1103 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1104 | -#: apt.conf.5.xml:766 |
1105 | +#: apt.conf.5.xml:775 |
1106 | msgid "" |
1107 | "Output information about the process of accessing collections of packages " |
1108 | "stored on CD-ROMs." |
1109 | msgstr "" |
1110 | |
1111 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1112 | -#: apt.conf.5.xml:773 |
1113 | +#: apt.conf.5.xml:782 |
1114 | msgid "<literal>Debug::BuildDeps</literal>" |
1115 | msgstr "" |
1116 | |
1117 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1118 | -#: apt.conf.5.xml:776 |
1119 | +#: apt.conf.5.xml:785 |
1120 | msgid "Describes the process of resolving build-dependencies in &apt-get;." |
1121 | msgstr "" |
1122 | |
1123 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1124 | -#: apt.conf.5.xml:783 |
1125 | +#: apt.conf.5.xml:792 |
1126 | msgid "<literal>Debug::Hashes</literal>" |
1127 | msgstr "" |
1128 | |
1129 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1130 | -#: apt.conf.5.xml:786 |
1131 | +#: apt.conf.5.xml:795 |
1132 | msgid "" |
1133 | "Output each cryptographic hash that is generated by the " |
1134 | "<literal>apt</literal> libraries." |
1135 | msgstr "" |
1136 | |
1137 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1138 | -#: apt.conf.5.xml:793 |
1139 | +#: apt.conf.5.xml:802 |
1140 | msgid "<literal>Debug::IdentCDROM</literal>" |
1141 | msgstr "" |
1142 | |
1143 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1144 | -#: apt.conf.5.xml:796 |
1145 | +#: apt.conf.5.xml:805 |
1146 | msgid "" |
1147 | "Do not include information from <literal>statfs</literal>, namely the number " |
1148 | "of used and free blocks on the CD-ROM filesystem, when generating an ID for " |
1149 | @@ -5649,92 +5663,92 @@ |
1150 | msgstr "" |
1151 | |
1152 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1153 | -#: apt.conf.5.xml:804 |
1154 | +#: apt.conf.5.xml:813 |
1155 | msgid "<literal>Debug::NoLocking</literal>" |
1156 | msgstr "" |
1157 | |
1158 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1159 | -#: apt.conf.5.xml:807 |
1160 | +#: apt.conf.5.xml:816 |
1161 | msgid "" |
1162 | "Disable all file locking. For instance, this will allow two instances of " |
1163 | "<quote><literal>apt-get update</literal></quote> to run at the same time." |
1164 | msgstr "" |
1165 | |
1166 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1167 | -#: apt.conf.5.xml:815 |
1168 | +#: apt.conf.5.xml:824 |
1169 | msgid "<literal>Debug::pkgAcquire</literal>" |
1170 | msgstr "" |
1171 | |
1172 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1173 | -#: apt.conf.5.xml:819 |
1174 | +#: apt.conf.5.xml:828 |
1175 | msgid "Log when items are added to or removed from the global download queue." |
1176 | msgstr "" |
1177 | |
1178 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1179 | -#: apt.conf.5.xml:826 |
1180 | +#: apt.conf.5.xml:835 |
1181 | msgid "<literal>Debug::pkgAcquire::Auth</literal>" |
1182 | msgstr "" |
1183 | |
1184 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1185 | -#: apt.conf.5.xml:829 |
1186 | +#: apt.conf.5.xml:838 |
1187 | msgid "" |
1188 | "Output status messages and errors related to verifying checksums and " |
1189 | "cryptographic signatures of downloaded files." |
1190 | msgstr "" |
1191 | |
1192 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1193 | -#: apt.conf.5.xml:836 |
1194 | +#: apt.conf.5.xml:845 |
1195 | msgid "<literal>Debug::pkgAcquire::Diffs</literal>" |
1196 | msgstr "" |
1197 | |
1198 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1199 | -#: apt.conf.5.xml:839 |
1200 | +#: apt.conf.5.xml:848 |
1201 | msgid "" |
1202 | "Output information about downloading and applying package index list diffs, " |
1203 | "and errors relating to package index list diffs." |
1204 | msgstr "" |
1205 | |
1206 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1207 | -#: apt.conf.5.xml:847 |
1208 | +#: apt.conf.5.xml:856 |
1209 | msgid "<literal>Debug::pkgAcquire::RRed</literal>" |
1210 | msgstr "" |
1211 | |
1212 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1213 | -#: apt.conf.5.xml:851 |
1214 | +#: apt.conf.5.xml:860 |
1215 | msgid "" |
1216 | "Output information related to patching apt package lists when downloading " |
1217 | "index diffs instead of full indices." |
1218 | msgstr "" |
1219 | |
1220 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1221 | -#: apt.conf.5.xml:858 |
1222 | +#: apt.conf.5.xml:867 |
1223 | msgid "<literal>Debug::pkgAcquire::Worker</literal>" |
1224 | msgstr "" |
1225 | |
1226 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1227 | -#: apt.conf.5.xml:862 |
1228 | +#: apt.conf.5.xml:871 |
1229 | msgid "Log all interactions with the sub-processes that actually perform downloads." |
1230 | msgstr "" |
1231 | |
1232 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1233 | -#: apt.conf.5.xml:869 |
1234 | +#: apt.conf.5.xml:878 |
1235 | msgid "<literal>Debug::pkgAutoRemove</literal>" |
1236 | msgstr "" |
1237 | |
1238 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1239 | -#: apt.conf.5.xml:873 |
1240 | +#: apt.conf.5.xml:882 |
1241 | msgid "" |
1242 | "Log events related to the automatically-installed status of packages and to " |
1243 | "the removal of unused packages." |
1244 | msgstr "" |
1245 | |
1246 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1247 | -#: apt.conf.5.xml:880 |
1248 | +#: apt.conf.5.xml:889 |
1249 | msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" |
1250 | msgstr "" |
1251 | |
1252 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1253 | -#: apt.conf.5.xml:883 |
1254 | +#: apt.conf.5.xml:892 |
1255 | msgid "" |
1256 | "Generate debug messages describing which packages are being automatically " |
1257 | "installed to resolve dependencies. This corresponds to the initial " |
1258 | @@ -5744,12 +5758,12 @@ |
1259 | msgstr "" |
1260 | |
1261 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1262 | -#: apt.conf.5.xml:894 |
1263 | +#: apt.conf.5.xml:903 |
1264 | msgid "<literal>Debug::pkgDepCache::Marker</literal>" |
1265 | msgstr "" |
1266 | |
1267 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1268 | -#: apt.conf.5.xml:897 |
1269 | +#: apt.conf.5.xml:906 |
1270 | msgid "" |
1271 | "Generate debug messages describing which package is marked as " |
1272 | "keep/install/remove while the ProblemResolver does his work. Each addition " |
1273 | @@ -5767,90 +5781,90 @@ |
1274 | msgstr "" |
1275 | |
1276 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1277 | -#: apt.conf.5.xml:916 |
1278 | +#: apt.conf.5.xml:925 |
1279 | msgid "<literal>Debug::pkgInitConfig</literal>" |
1280 | msgstr "" |
1281 | |
1282 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1283 | -#: apt.conf.5.xml:919 |
1284 | +#: apt.conf.5.xml:928 |
1285 | msgid "Dump the default configuration to standard error on startup." |
1286 | msgstr "" |
1287 | |
1288 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1289 | -#: apt.conf.5.xml:926 |
1290 | +#: apt.conf.5.xml:935 |
1291 | msgid "<literal>Debug::pkgDPkgPM</literal>" |
1292 | msgstr "" |
1293 | |
1294 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1295 | -#: apt.conf.5.xml:929 |
1296 | +#: apt.conf.5.xml:938 |
1297 | msgid "" |
1298 | "When invoking &dpkg;, output the precise command line with which it is being " |
1299 | "invoked, with arguments separated by a single space character." |
1300 | msgstr "" |
1301 | |
1302 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1303 | -#: apt.conf.5.xml:937 |
1304 | +#: apt.conf.5.xml:946 |
1305 | msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" |
1306 | msgstr "" |
1307 | |
1308 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1309 | -#: apt.conf.5.xml:940 |
1310 | +#: apt.conf.5.xml:949 |
1311 | msgid "" |
1312 | "Output all the data received from &dpkg; on the status file descriptor and " |
1313 | "any errors encountered while parsing it." |
1314 | msgstr "" |
1315 | |
1316 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1317 | -#: apt.conf.5.xml:947 |
1318 | +#: apt.conf.5.xml:956 |
1319 | msgid "<literal>Debug::pkgOrderList</literal>" |
1320 | msgstr "" |
1321 | |
1322 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1323 | -#: apt.conf.5.xml:951 |
1324 | +#: apt.conf.5.xml:960 |
1325 | msgid "" |
1326 | "Generate a trace of the algorithm that decides the order in which " |
1327 | "<literal>apt</literal> should pass packages to &dpkg;." |
1328 | msgstr "" |
1329 | |
1330 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1331 | -#: apt.conf.5.xml:959 |
1332 | +#: apt.conf.5.xml:968 |
1333 | msgid "<literal>Debug::pkgPackageManager</literal>" |
1334 | msgstr "" |
1335 | |
1336 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1337 | -#: apt.conf.5.xml:963 |
1338 | +#: apt.conf.5.xml:972 |
1339 | msgid "Output status messages tracing the steps performed when invoking &dpkg;." |
1340 | msgstr "" |
1341 | |
1342 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1343 | -#: apt.conf.5.xml:970 |
1344 | +#: apt.conf.5.xml:979 |
1345 | msgid "<literal>Debug::pkgPolicy</literal>" |
1346 | msgstr "" |
1347 | |
1348 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1349 | -#: apt.conf.5.xml:974 |
1350 | +#: apt.conf.5.xml:983 |
1351 | msgid "Output the priority of each package list on startup." |
1352 | msgstr "" |
1353 | |
1354 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1355 | -#: apt.conf.5.xml:980 |
1356 | +#: apt.conf.5.xml:989 |
1357 | msgid "<literal>Debug::pkgProblemResolver</literal>" |
1358 | msgstr "" |
1359 | |
1360 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1361 | -#: apt.conf.5.xml:984 |
1362 | +#: apt.conf.5.xml:993 |
1363 | msgid "" |
1364 | "Trace the execution of the dependency resolver (this applies only to what " |
1365 | "happens when a complex dependency problem is encountered)." |
1366 | msgstr "" |
1367 | |
1368 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1369 | -#: apt.conf.5.xml:992 |
1370 | +#: apt.conf.5.xml:1001 |
1371 | msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" |
1372 | msgstr "" |
1373 | |
1374 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1375 | -#: apt.conf.5.xml:995 |
1376 | +#: apt.conf.5.xml:1004 |
1377 | msgid "" |
1378 | "Display a list of all installed packages with their calculated score used by " |
1379 | "the pkgProblemResolver. The description of the package is the same as " |
1380 | @@ -5858,32 +5872,32 @@ |
1381 | msgstr "" |
1382 | |
1383 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1384 | -#: apt.conf.5.xml:1003 |
1385 | +#: apt.conf.5.xml:1012 |
1386 | msgid "<literal>Debug::sourceList</literal>" |
1387 | msgstr "" |
1388 | |
1389 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1390 | -#: apt.conf.5.xml:1007 |
1391 | +#: apt.conf.5.xml:1016 |
1392 | msgid "" |
1393 | "Print information about the vendors read from " |
1394 | "<filename>/etc/apt/vendors.list</filename>." |
1395 | msgstr "" |
1396 | |
1397 | #. type: Content of: <refentry><refsect1><para> |
1398 | -#: apt.conf.5.xml:1030 |
1399 | +#: apt.conf.5.xml:1039 |
1400 | msgid "" |
1401 | "&configureindex; is a configuration file showing example values for all " |
1402 | "possible options." |
1403 | msgstr "" |
1404 | |
1405 | #. type: Content of: <refentry><refsect1><variablelist> |
1406 | -#: apt.conf.5.xml:1037 |
1407 | +#: apt.conf.5.xml:1046 |
1408 | msgid "&file-aptconf;" |
1409 | msgstr "" |
1410 | |
1411 | #. ? reading apt.conf |
1412 | #. type: Content of: <refentry><refsect1><para> |
1413 | -#: apt.conf.5.xml:1042 |
1414 | +#: apt.conf.5.xml:1051 |
1415 | msgid "&apt-cache;, &apt-config;, &apt-preferences;." |
1416 | msgstr "" |
1417 | |
1418 | |
1419 | === modified file 'doc/po/de.po' |
1420 | --- doc/po/de.po 2010-02-18 20:06:47 +0000 |
1421 | +++ doc/po/de.po 2010-07-06 11:16:27 +0000 |
1422 | @@ -7,7 +7,7 @@ |
1423 | msgstr "" |
1424 | "Project-Id-Version: apt-doc 0.7.24\n" |
1425 | "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" |
1426 | -"POT-Creation-Date: 2010-02-18 20:53+0100\n" |
1427 | +"POT-Creation-Date: 2010-06-11 10:56+0300\n" |
1428 | "PO-Revision-Date: 2009-12-31 17:41+GMT\n" |
1429 | "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" |
1430 | "Language-Team: German <debian-l10n-german@lists.debian.org>\n" |
1431 | @@ -1751,7 +1751,7 @@ |
1432 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1433 | #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 |
1434 | #: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 |
1435 | -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 |
1436 | +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:511 apt.conf.5.xml:533 |
1437 | msgid "options" |
1438 | msgstr "Optionen" |
1439 | |
1440 | @@ -1994,7 +1994,7 @@ |
1441 | |
1442 | #. type: Content of: <refentry><refsect1><title> |
1443 | #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 |
1444 | -#: apt.conf.5.xml:1035 apt_preferences.5.xml:630 |
1445 | +#: apt.conf.5.xml:1044 apt_preferences.5.xml:630 |
1446 | msgid "Files" |
1447 | msgstr "Dateien" |
1448 | |
1449 | @@ -2007,7 +2007,7 @@ |
1450 | #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 |
1451 | #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:569 |
1452 | #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 |
1453 | -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:637 |
1454 | +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1050 apt_preferences.5.xml:637 |
1455 | #: sources.list.5.xml:233 |
1456 | msgid "See Also" |
1457 | msgstr "Siehe auch" |
1458 | @@ -3717,7 +3717,7 @@ |
1459 | "Dateien mit <command>apt-ftparchive</command> zu erstellen." |
1460 | |
1461 | #. type: Content of: <refentry><refsect1><title> |
1462 | -#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:477 |
1463 | +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1038 apt_preferences.5.xml:477 |
1464 | #: sources.list.5.xml:193 |
1465 | msgid "Examples" |
1466 | msgstr "Beispiele" |
1467 | @@ -6811,11 +6811,30 @@ |
1468 | |
1469 | #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> |
1470 | #: apt.conf.5.xml:414 |
1471 | +msgid "GzipIndexes" |
1472 | +msgstr "GzipIndexes" |
1473 | + |
1474 | +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> |
1475 | +#: apt.conf.5.xml:416 |
1476 | +msgid "" |
1477 | +"When downloading <literal>gzip</literal> compressed indexes (Packages, " |
1478 | +"Sources, or Translations), keep them gzip compressed locally instead of " |
1479 | +"unpacking them. This saves quite a lot of disk space at the expense of more " |
1480 | +"CPU requirements when building the local package caches. False by default." |
1481 | +msgstr "" |
1482 | +"Wenn <literal>gzip</literal>-komprimierte Indizes heruntergeladen werden " |
1483 | +"(Packages, Sources, oder Translations), speichere sie lokal mit " |
1484 | +"gzip-Komprimierung. Dies spart eine Menge Festplattenplatz, aber benötigt " |
1485 | +"mehr CPU-Ressourcen bei der Erstellung des lokalen Paket-Caches. " |
1486 | +"Vorgabe ist False." |
1487 | + |
1488 | +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> |
1489 | +#: apt.conf.5.xml:423 |
1490 | msgid "Languages" |
1491 | msgstr "Sprachen" |
1492 | |
1493 | #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> |
1494 | -#: apt.conf.5.xml:415 |
1495 | +#: apt.conf.5.xml:424 |
1496 | #, fuzzy |
1497 | #| msgid "" |
1498 | #| "The Languages subsection controls which <filename>Translation</filename> " |
1499 | @@ -6847,13 +6866,13 @@ |
1500 | "hier unmögliche Werte einsetzen." |
1501 | |
1502 | #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> |
1503 | -#: apt.conf.5.xml:431 |
1504 | +#: apt.conf.5.xml:440 |
1505 | #, no-wrap |
1506 | msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" |
1507 | msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" |
1508 | |
1509 | #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> |
1510 | -#: apt.conf.5.xml:421 |
1511 | +#: apt.conf.5.xml:430 |
1512 | #, fuzzy |
1513 | #| msgid "" |
1514 | #| "The default list includes \"environment\" and \"en\". " |
1515 | @@ -6925,12 +6944,12 @@ |
1516 | "id=\"0\"/>" |
1517 | |
1518 | #. type: Content of: <refentry><refsect1><title> |
1519 | -#: apt.conf.5.xml:438 |
1520 | +#: apt.conf.5.xml:447 |
1521 | msgid "Directories" |
1522 | msgstr "Verzeichnisse" |
1523 | |
1524 | #. type: Content of: <refentry><refsect1><para> |
1525 | -#: apt.conf.5.xml:440 |
1526 | +#: apt.conf.5.xml:449 |
1527 | msgid "" |
1528 | "The <literal>Dir::State</literal> section has directories that pertain to " |
1529 | "local state information. <literal>lists</literal> is the directory to place " |
1530 | @@ -6950,7 +6969,7 @@ |
1531 | "filename> oder <filename>./</filename> beginnen." |
1532 | |
1533 | #. type: Content of: <refentry><refsect1><para> |
1534 | -#: apt.conf.5.xml:447 |
1535 | +#: apt.conf.5.xml:456 |
1536 | msgid "" |
1537 | "<literal>Dir::Cache</literal> contains locations pertaining to local cache " |
1538 | "information, such as the two package caches <literal>srcpkgcache</literal> " |
1539 | @@ -6973,7 +6992,7 @@ |
1540 | "<literal>Dir::Cache</literal> enthalten." |
1541 | |
1542 | #. type: Content of: <refentry><refsect1><para> |
1543 | -#: apt.conf.5.xml:456 |
1544 | +#: apt.conf.5.xml:465 |
1545 | msgid "" |
1546 | "<literal>Dir::Etc</literal> contains the location of configuration files, " |
1547 | "<literal>sourcelist</literal> gives the location of the sourcelist and " |
1548 | @@ -6988,7 +7007,7 @@ |
1549 | "Konfigurationsdatei erfolgt)." |
1550 | |
1551 | #. type: Content of: <refentry><refsect1><para> |
1552 | -#: apt.conf.5.xml:462 |
1553 | +#: apt.conf.5.xml:471 |
1554 | msgid "" |
1555 | "The <literal>Dir::Parts</literal> setting reads in all the config fragments " |
1556 | "in lexical order from the directory specified. After this is done then the " |
1557 | @@ -7000,7 +7019,7 @@ |
1558 | "geladen." |
1559 | |
1560 | #. type: Content of: <refentry><refsect1><para> |
1561 | -#: apt.conf.5.xml:466 |
1562 | +#: apt.conf.5.xml:475 |
1563 | msgid "" |
1564 | "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" |
1565 | "Bin::Methods</literal> specifies the location of the method handlers and " |
1566 | @@ -7018,7 +7037,7 @@ |
1567 | "Programms an." |
1568 | |
1569 | #. type: Content of: <refentry><refsect1><para> |
1570 | -#: apt.conf.5.xml:474 |
1571 | +#: apt.conf.5.xml:483 |
1572 | msgid "" |
1573 | "The configuration item <literal>RootDir</literal> has a special meaning. If " |
1574 | "set, all paths in <literal>Dir::</literal> will be relative to " |
1575 | @@ -7038,12 +7057,12 @@ |
1576 | "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." |
1577 | |
1578 | #. type: Content of: <refentry><refsect1><title> |
1579 | -#: apt.conf.5.xml:487 |
1580 | +#: apt.conf.5.xml:496 |
1581 | msgid "APT in DSelect" |
1582 | msgstr "APT in DSelect" |
1583 | |
1584 | #. type: Content of: <refentry><refsect1><para> |
1585 | -#: apt.conf.5.xml:489 |
1586 | +#: apt.conf.5.xml:498 |
1587 | msgid "" |
1588 | "When APT is used as a &dselect; method several configuration directives " |
1589 | "control the default behaviour. These are in the <literal>DSelect</literal> " |
1590 | @@ -7054,12 +7073,12 @@ |
1591 | "<literal>DSelect</literal>." |
1592 | |
1593 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1594 | -#: apt.conf.5.xml:493 |
1595 | +#: apt.conf.5.xml:502 |
1596 | msgid "Clean" |
1597 | msgstr "Clean" |
1598 | |
1599 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1600 | -#: apt.conf.5.xml:494 |
1601 | +#: apt.conf.5.xml:503 |
1602 | msgid "" |
1603 | "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " |
1604 | "and never. always and prompt will remove all packages from the cache after " |
1605 | @@ -7077,7 +7096,7 @@ |
1606 | "vor dem Herunterladen neuer Pakete durch." |
1607 | |
1608 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1609 | -#: apt.conf.5.xml:503 |
1610 | +#: apt.conf.5.xml:512 |
1611 | msgid "" |
1612 | "The contents of this variable is passed to &apt-get; as command line options " |
1613 | "when it is run for the install phase." |
1614 | @@ -7086,12 +7105,12 @@ |
1615 | "übermittelt, wenn es für die Installationsphase durchlaufen wird." |
1616 | |
1617 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1618 | -#: apt.conf.5.xml:507 |
1619 | +#: apt.conf.5.xml:516 |
1620 | msgid "Updateoptions" |
1621 | msgstr "Updateoptions" |
1622 | |
1623 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1624 | -#: apt.conf.5.xml:508 |
1625 | +#: apt.conf.5.xml:517 |
1626 | msgid "" |
1627 | "The contents of this variable is passed to &apt-get; as command line options " |
1628 | "when it is run for the update phase." |
1629 | @@ -7100,12 +7119,12 @@ |
1630 | "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." |
1631 | |
1632 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1633 | -#: apt.conf.5.xml:512 |
1634 | +#: apt.conf.5.xml:521 |
1635 | msgid "PromptAfterUpdate" |
1636 | msgstr "PromptAfterUpdate" |
1637 | |
1638 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1639 | -#: apt.conf.5.xml:513 |
1640 | +#: apt.conf.5.xml:522 |
1641 | msgid "" |
1642 | "If true the [U]pdate operation in &dselect; will always prompt to continue. " |
1643 | "The default is to prompt only on error." |
1644 | @@ -7114,12 +7133,12 @@ |
1645 | "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." |
1646 | |
1647 | #. type: Content of: <refentry><refsect1><title> |
1648 | -#: apt.conf.5.xml:519 |
1649 | +#: apt.conf.5.xml:528 |
1650 | msgid "How APT calls dpkg" |
1651 | msgstr "Wie APT Dpkg aufruft" |
1652 | |
1653 | #. type: Content of: <refentry><refsect1><para> |
1654 | -#: apt.conf.5.xml:520 |
1655 | +#: apt.conf.5.xml:529 |
1656 | msgid "" |
1657 | "Several configuration directives control how APT invokes &dpkg;. These are " |
1658 | "in the <literal>DPkg</literal> section." |
1659 | @@ -7128,7 +7147,7 @@ |
1660 | "stehen im Abschnitt <literal>DPkg</literal>." |
1661 | |
1662 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1663 | -#: apt.conf.5.xml:525 |
1664 | +#: apt.conf.5.xml:534 |
1665 | msgid "" |
1666 | "This is a list of options to pass to dpkg. The options must be specified " |
1667 | "using the list notation and each list item is passed as a single argument to " |
1668 | @@ -7139,17 +7158,17 @@ |
1669 | "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." |
1670 | |
1671 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1672 | -#: apt.conf.5.xml:530 |
1673 | +#: apt.conf.5.xml:539 |
1674 | msgid "Pre-Invoke" |
1675 | msgstr "Pre-Invoke" |
1676 | |
1677 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1678 | -#: apt.conf.5.xml:530 |
1679 | +#: apt.conf.5.xml:539 |
1680 | msgid "Post-Invoke" |
1681 | msgstr "Post-Invoke" |
1682 | |
1683 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1684 | -#: apt.conf.5.xml:531 |
1685 | +#: apt.conf.5.xml:540 |
1686 | msgid "" |
1687 | "This is a list of shell commands to run before/after invoking &dpkg;. Like " |
1688 | "<literal>options</literal> this must be specified in list notation. The " |
1689 | @@ -7163,12 +7182,12 @@ |
1690 | "APT abgebrochen." |
1691 | |
1692 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1693 | -#: apt.conf.5.xml:537 |
1694 | +#: apt.conf.5.xml:546 |
1695 | msgid "Pre-Install-Pkgs" |
1696 | msgstr "Pre-Install-Pkgs" |
1697 | |
1698 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1699 | -#: apt.conf.5.xml:538 |
1700 | +#: apt.conf.5.xml:547 |
1701 | msgid "" |
1702 | "This is a list of shell commands to run before invoking dpkg. Like " |
1703 | "<literal>options</literal> this must be specified in list notation. The " |
1704 | @@ -7185,7 +7204,7 @@ |
1705 | "pro Zeile." |
1706 | |
1707 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1708 | -#: apt.conf.5.xml:544 |
1709 | +#: apt.conf.5.xml:553 |
1710 | msgid "" |
1711 | "Version 2 of this protocol dumps more information, including the protocol " |
1712 | "version, the APT configuration space and the packages, files and versions " |
1713 | @@ -7201,12 +7220,12 @@ |
1714 | "literal> gegeben wird." |
1715 | |
1716 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1717 | -#: apt.conf.5.xml:551 |
1718 | +#: apt.conf.5.xml:560 |
1719 | msgid "Run-Directory" |
1720 | msgstr "Run-Directory" |
1721 | |
1722 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1723 | -#: apt.conf.5.xml:552 |
1724 | +#: apt.conf.5.xml:561 |
1725 | msgid "" |
1726 | "APT chdirs to this directory before invoking dpkg, the default is <filename>/" |
1727 | "</filename>." |
1728 | @@ -7215,12 +7234,12 @@ |
1729 | "die Vorgabe ist <filename>/</filename>." |
1730 | |
1731 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1732 | -#: apt.conf.5.xml:556 |
1733 | +#: apt.conf.5.xml:565 |
1734 | msgid "Build-options" |
1735 | msgstr "Build-options" |
1736 | |
1737 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1738 | -#: apt.conf.5.xml:557 |
1739 | +#: apt.conf.5.xml:566 |
1740 | msgid "" |
1741 | "These options are passed to &dpkg-buildpackage; when compiling packages, the " |
1742 | "default is to disable signing and produce all binaries." |
1743 | @@ -7230,12 +7249,12 @@ |
1744 | "Programme werden erstellt." |
1745 | |
1746 | #. type: Content of: <refentry><refsect1><refsect2><title> |
1747 | -#: apt.conf.5.xml:562 |
1748 | +#: apt.conf.5.xml:571 |
1749 | msgid "dpkg trigger usage (and related options)" |
1750 | msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)" |
1751 | |
1752 | #. type: Content of: <refentry><refsect1><refsect2><para> |
1753 | -#: apt.conf.5.xml:563 |
1754 | +#: apt.conf.5.xml:572 |
1755 | msgid "" |
1756 | "APT can call dpkg in a way so it can make aggressive use of triggers over " |
1757 | "multiply calls of dpkg. Without further options dpkg will use triggers only " |
1758 | @@ -7261,7 +7280,7 @@ |
1759 | "Status 100% stehen, während es aktuell alle Pakete konfiguriert." |
1760 | |
1761 | #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> |
1762 | -#: apt.conf.5.xml:578 |
1763 | +#: apt.conf.5.xml:587 |
1764 | #, no-wrap |
1765 | msgid "" |
1766 | "DPkg::NoTriggers \"true\";\n" |
1767 | @@ -7275,7 +7294,7 @@ |
1768 | "DPkg::TriggersPending \"true\";" |
1769 | |
1770 | #. type: Content of: <refentry><refsect1><refsect2><para> |
1771 | -#: apt.conf.5.xml:572 |
1772 | +#: apt.conf.5.xml:581 |
1773 | msgid "" |
1774 | "Note that it is not guaranteed that APT will support these options or that " |
1775 | "these options will not cause (big) trouble in the future. If you have " |
1776 | @@ -7300,12 +7319,12 @@ |
1777 | "wäre <placeholder type=\"literallayout\" id=\"0\"/>" |
1778 | |
1779 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
1780 | -#: apt.conf.5.xml:584 |
1781 | +#: apt.conf.5.xml:593 |
1782 | msgid "DPkg::NoTriggers" |
1783 | msgstr "DPkg::NoTriggers" |
1784 | |
1785 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
1786 | -#: apt.conf.5.xml:585 |
1787 | +#: apt.conf.5.xml:594 |
1788 | msgid "" |
1789 | "Add the no triggers flag to all dpkg calls (except the ConfigurePending " |
1790 | "call). See &dpkg; if you are interested in what this actually means. In " |
1791 | @@ -7326,12 +7345,12 @@ |
1792 | "außerdem an die »unpack«- und »remove«-Aufrufe anhängen." |
1793 | |
1794 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
1795 | -#: apt.conf.5.xml:592 |
1796 | +#: apt.conf.5.xml:601 |
1797 | msgid "PackageManager::Configure" |
1798 | msgstr "PackageManager::Configure" |
1799 | |
1800 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
1801 | -#: apt.conf.5.xml:593 |
1802 | +#: apt.conf.5.xml:602 |
1803 | msgid "" |
1804 | "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " |
1805 | "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " |
1806 | @@ -7360,12 +7379,12 @@ |
1807 | "mehr startbar sein könnte." |
1808 | |
1809 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
1810 | -#: apt.conf.5.xml:603 |
1811 | +#: apt.conf.5.xml:612 |
1812 | msgid "DPkg::ConfigurePending" |
1813 | msgstr "DPkg::ConfigurePending" |
1814 | |
1815 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
1816 | -#: apt.conf.5.xml:604 |
1817 | +#: apt.conf.5.xml:613 |
1818 | msgid "" |
1819 | "If this option is set apt will call <command>dpkg --configure --pending</" |
1820 | "command> to let dpkg handle all required configurations and triggers. This " |
1821 | @@ -7384,12 +7403,12 @@ |
1822 | "deaktivieren." |
1823 | |
1824 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
1825 | -#: apt.conf.5.xml:610 |
1826 | +#: apt.conf.5.xml:619 |
1827 | msgid "DPkg::TriggersPending" |
1828 | msgstr "DPkg::TriggersPending" |
1829 | |
1830 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
1831 | -#: apt.conf.5.xml:611 |
1832 | +#: apt.conf.5.xml:620 |
1833 | msgid "" |
1834 | "Useful for <literal>smart</literal> configuration as a package which has " |
1835 | "pending triggers is not considered as <literal>installed</literal> and dpkg " |
1836 | @@ -7405,12 +7424,12 @@ |
1837 | "benötigt werden." |
1838 | |
1839 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
1840 | -#: apt.conf.5.xml:616 |
1841 | +#: apt.conf.5.xml:625 |
1842 | msgid "PackageManager::UnpackAll" |
1843 | msgstr "PackageManager::UnpackAll" |
1844 | |
1845 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
1846 | -#: apt.conf.5.xml:617 |
1847 | +#: apt.conf.5.xml:626 |
1848 | msgid "" |
1849 | "As the configuration can be deferred to be done at the end by dpkg it can be " |
1850 | "tried to order the unpack series only by critical needs, e.g. by Pre-" |
1851 | @@ -7429,12 +7448,12 @@ |
1852 | "und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird." |
1853 | |
1854 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> |
1855 | -#: apt.conf.5.xml:624 |
1856 | +#: apt.conf.5.xml:633 |
1857 | msgid "OrderList::Score::Immediate" |
1858 | msgstr "OrderList::Score::Immediate" |
1859 | |
1860 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> |
1861 | -#: apt.conf.5.xml:632 |
1862 | +#: apt.conf.5.xml:641 |
1863 | #, no-wrap |
1864 | msgid "" |
1865 | "OrderList::Score {\n" |
1866 | @@ -7452,7 +7471,7 @@ |
1867 | "};" |
1868 | |
1869 | #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> |
1870 | -#: apt.conf.5.xml:625 |
1871 | +#: apt.conf.5.xml:634 |
1872 | msgid "" |
1873 | "Essential packages (and there dependencies) should be configured immediately " |
1874 | "after unpacking. It will be a good idea to do this quite early in the " |
1875 | @@ -7476,12 +7495,12 @@ |
1876 | "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" |
1877 | |
1878 | #. type: Content of: <refentry><refsect1><title> |
1879 | -#: apt.conf.5.xml:645 |
1880 | +#: apt.conf.5.xml:654 |
1881 | msgid "Periodic and Archives options" |
1882 | msgstr "Periodische- und Archivoptionen" |
1883 | |
1884 | #. type: Content of: <refentry><refsect1><para> |
1885 | -#: apt.conf.5.xml:646 |
1886 | +#: apt.conf.5.xml:655 |
1887 | msgid "" |
1888 | "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " |
1889 | "of options configure behavior of apt periodic updates, which is done by " |
1890 | @@ -7495,12 +7514,12 @@ |
1891 | "Dokumentation dieser Optionen zu erhalten." |
1892 | |
1893 | #. type: Content of: <refentry><refsect1><title> |
1894 | -#: apt.conf.5.xml:654 |
1895 | +#: apt.conf.5.xml:663 |
1896 | msgid "Debug options" |
1897 | msgstr "Fehlersuchoptionen" |
1898 | |
1899 | #. type: Content of: <refentry><refsect1><para> |
1900 | -#: apt.conf.5.xml:656 |
1901 | +#: apt.conf.5.xml:665 |
1902 | msgid "" |
1903 | "Enabling options in the <literal>Debug::</literal> section will cause " |
1904 | "debugging information to be sent to the standard error stream of the program " |
1905 | @@ -7518,7 +7537,7 @@ |
1906 | "könnten es sein:" |
1907 | |
1908 | #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> |
1909 | -#: apt.conf.5.xml:667 |
1910 | +#: apt.conf.5.xml:676 |
1911 | msgid "" |
1912 | "<literal>Debug::pkgProblemResolver</literal> enables output about the " |
1913 | "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" |
1914 | @@ -7529,7 +7548,7 @@ |
1915 | "getroffenen Entscheidungen ein." |
1916 | |
1917 | #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> |
1918 | -#: apt.conf.5.xml:675 |
1919 | +#: apt.conf.5.xml:684 |
1920 | msgid "" |
1921 | "<literal>Debug::NoLocking</literal> disables all file locking. This can be " |
1922 | "used to run some operations (for instance, <literal>apt-get -s install</" |
1923 | @@ -7540,7 +7559,7 @@ |
1924 | "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen." |
1925 | |
1926 | #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> |
1927 | -#: apt.conf.5.xml:684 |
1928 | +#: apt.conf.5.xml:693 |
1929 | msgid "" |
1930 | "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " |
1931 | "time that <literal>apt</literal> invokes &dpkg;." |
1932 | @@ -7552,7 +7571,7 @@ |
1933 | #. motivating example, except I haven't a clue why you'd want |
1934 | #. to do this. |
1935 | #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> |
1936 | -#: apt.conf.5.xml:692 |
1937 | +#: apt.conf.5.xml:701 |
1938 | msgid "" |
1939 | "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " |
1940 | "in CDROM IDs." |
1941 | @@ -7561,17 +7580,17 @@ |
1942 | "Daten in CD-ROM-IDs aus." |
1943 | |
1944 | #. type: Content of: <refentry><refsect1><para> |
1945 | -#: apt.conf.5.xml:702 |
1946 | +#: apt.conf.5.xml:711 |
1947 | msgid "A full list of debugging options to apt follows." |
1948 | msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt." |
1949 | |
1950 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1951 | -#: apt.conf.5.xml:707 |
1952 | +#: apt.conf.5.xml:716 |
1953 | msgid "<literal>Debug::Acquire::cdrom</literal>" |
1954 | msgstr "<literal>Debug::Acquire::cdrom</literal>" |
1955 | |
1956 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1957 | -#: apt.conf.5.xml:711 |
1958 | +#: apt.conf.5.xml:720 |
1959 | msgid "" |
1960 | "Print information related to accessing <literal>cdrom://</literal> sources." |
1961 | msgstr "" |
1962 | @@ -7579,48 +7598,48 @@ |
1963 | "literal>-Quellen beziehen." |
1964 | |
1965 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1966 | -#: apt.conf.5.xml:718 |
1967 | +#: apt.conf.5.xml:727 |
1968 | msgid "<literal>Debug::Acquire::ftp</literal>" |
1969 | msgstr "<literal>Debug::Acquire::ftp</literal>" |
1970 | |
1971 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1972 | -#: apt.conf.5.xml:722 |
1973 | +#: apt.conf.5.xml:731 |
1974 | msgid "Print information related to downloading packages using FTP." |
1975 | msgstr "" |
1976 | "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP " |
1977 | "beziehen." |
1978 | |
1979 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1980 | -#: apt.conf.5.xml:729 |
1981 | +#: apt.conf.5.xml:738 |
1982 | msgid "<literal>Debug::Acquire::http</literal>" |
1983 | msgstr "<literal>Debug::Acquire::http</literal>" |
1984 | |
1985 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
1986 | -#: apt.conf.5.xml:733 |
1987 | +#: apt.conf.5.xml:742 |
1988 | msgid "Print information related to downloading packages using HTTP." |
1989 | msgstr "" |
1990 | "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP " |
1991 | "beziehen." |
1992 | |
1993 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
1994 | -#: apt.conf.5.xml:740 |
1995 | +#: apt.conf.5.xml:749 |
1996 | msgid "<literal>Debug::Acquire::https</literal>" |
1997 | msgstr "<literal>Debug::Acquire::https</literal>" |
1998 | |
1999 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2000 | -#: apt.conf.5.xml:744 |
2001 | +#: apt.conf.5.xml:753 |
2002 | msgid "Print information related to downloading packages using HTTPS." |
2003 | msgstr "" |
2004 | "Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS " |
2005 | "beziehen." |
2006 | |
2007 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2008 | -#: apt.conf.5.xml:751 |
2009 | +#: apt.conf.5.xml:760 |
2010 | msgid "<literal>Debug::Acquire::gpgv</literal>" |
2011 | msgstr "<literal>Debug::Acquire::gpgv</literal>" |
2012 | |
2013 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2014 | -#: apt.conf.5.xml:755 |
2015 | +#: apt.conf.5.xml:764 |
2016 | msgid "" |
2017 | "Print information related to verifying cryptographic signatures using " |
2018 | "<literal>gpg</literal>." |
2019 | @@ -7629,12 +7648,12 @@ |
2020 | "mittels <literal>gpg</literal> beziehen." |
2021 | |
2022 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2023 | -#: apt.conf.5.xml:762 |
2024 | +#: apt.conf.5.xml:771 |
2025 | msgid "<literal>Debug::aptcdrom</literal>" |
2026 | msgstr "<literal>Debug::aptcdrom</literal>" |
2027 | |
2028 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2029 | -#: apt.conf.5.xml:766 |
2030 | +#: apt.conf.5.xml:775 |
2031 | msgid "" |
2032 | "Output information about the process of accessing collections of packages " |
2033 | "stored on CD-ROMs." |
2034 | @@ -7643,23 +7662,23 @@ |
2035 | "CD-ROMs gespeichert sind." |
2036 | |
2037 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2038 | -#: apt.conf.5.xml:773 |
2039 | +#: apt.conf.5.xml:782 |
2040 | msgid "<literal>Debug::BuildDeps</literal>" |
2041 | msgstr "<literal>Debug::BuildDeps</literal>" |
2042 | |
2043 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2044 | -#: apt.conf.5.xml:776 |
2045 | +#: apt.conf.5.xml:785 |
2046 | msgid "Describes the process of resolving build-dependencies in &apt-get;." |
2047 | msgstr "" |
2048 | "Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;." |
2049 | |
2050 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2051 | -#: apt.conf.5.xml:783 |
2052 | +#: apt.conf.5.xml:792 |
2053 | msgid "<literal>Debug::Hashes</literal>" |
2054 | msgstr "<literal>Debug::Hashes</literal>" |
2055 | |
2056 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2057 | -#: apt.conf.5.xml:786 |
2058 | +#: apt.conf.5.xml:795 |
2059 | msgid "" |
2060 | "Output each cryptographic hash that is generated by the <literal>apt</" |
2061 | "literal> libraries." |
2062 | @@ -7668,12 +7687,12 @@ |
2063 | "Bibliotheken generiert wurde." |
2064 | |
2065 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2066 | -#: apt.conf.5.xml:793 |
2067 | +#: apt.conf.5.xml:802 |
2068 | msgid "<literal>Debug::IdentCDROM</literal>" |
2069 | msgstr "<literal>Debug::IdentCDROM</literal>" |
2070 | |
2071 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2072 | -#: apt.conf.5.xml:796 |
2073 | +#: apt.conf.5.xml:805 |
2074 | msgid "" |
2075 | "Do not include information from <literal>statfs</literal>, namely the number " |
2076 | "of used and free blocks on the CD-ROM filesystem, when generating an ID for " |
2077 | @@ -7684,12 +7703,12 @@ |
2078 | "ID für eine CD-ROM generiert wird." |
2079 | |
2080 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2081 | -#: apt.conf.5.xml:804 |
2082 | +#: apt.conf.5.xml:813 |
2083 | msgid "<literal>Debug::NoLocking</literal>" |
2084 | msgstr "<literal>Debug::NoLocking</literal>" |
2085 | |
2086 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2087 | -#: apt.conf.5.xml:807 |
2088 | +#: apt.conf.5.xml:816 |
2089 | msgid "" |
2090 | "Disable all file locking. For instance, this will allow two instances of " |
2091 | "<quote><literal>apt-get update</literal></quote> to run at the same time." |
2092 | @@ -7699,24 +7718,24 @@ |
2093 | "gleichen Zeit laufen." |
2094 | |
2095 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2096 | -#: apt.conf.5.xml:815 |
2097 | +#: apt.conf.5.xml:824 |
2098 | msgid "<literal>Debug::pkgAcquire</literal>" |
2099 | msgstr "<literal>Debug::pkgAcquire</literal>" |
2100 | |
2101 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2102 | -#: apt.conf.5.xml:819 |
2103 | +#: apt.conf.5.xml:828 |
2104 | msgid "Log when items are added to or removed from the global download queue." |
2105 | msgstr "" |
2106 | "Protokollieren, wenn Elemente aus der globalen Warteschlange zum " |
2107 | "Herunterladen hinzugefügt oder entfernt werden." |
2108 | |
2109 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2110 | -#: apt.conf.5.xml:826 |
2111 | +#: apt.conf.5.xml:835 |
2112 | msgid "<literal>Debug::pkgAcquire::Auth</literal>" |
2113 | msgstr "<literal>Debug::pkgAcquire::Auth</literal>" |
2114 | |
2115 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2116 | -#: apt.conf.5.xml:829 |
2117 | +#: apt.conf.5.xml:838 |
2118 | msgid "" |
2119 | "Output status messages and errors related to verifying checksums and " |
2120 | "cryptographic signatures of downloaded files." |
2121 | @@ -7725,12 +7744,12 @@ |
2122 | "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." |
2123 | |
2124 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2125 | -#: apt.conf.5.xml:836 |
2126 | +#: apt.conf.5.xml:845 |
2127 | msgid "<literal>Debug::pkgAcquire::Diffs</literal>" |
2128 | msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" |
2129 | |
2130 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2131 | -#: apt.conf.5.xml:839 |
2132 | +#: apt.conf.5.xml:848 |
2133 | msgid "" |
2134 | "Output information about downloading and applying package index list diffs, " |
2135 | "and errors relating to package index list diffs." |
2136 | @@ -7739,12 +7758,12 @@ |
2137 | "und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben." |
2138 | |
2139 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2140 | -#: apt.conf.5.xml:847 |
2141 | +#: apt.conf.5.xml:856 |
2142 | msgid "<literal>Debug::pkgAcquire::RRed</literal>" |
2143 | msgstr "<literal>Debug::pkgAcquire::RRed</literal>" |
2144 | |
2145 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2146 | -#: apt.conf.5.xml:851 |
2147 | +#: apt.conf.5.xml:860 |
2148 | msgid "" |
2149 | "Output information related to patching apt package lists when downloading " |
2150 | "index diffs instead of full indices." |
2151 | @@ -7754,12 +7773,12 @@ |
2152 | "werden." |
2153 | |
2154 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2155 | -#: apt.conf.5.xml:858 |
2156 | +#: apt.conf.5.xml:867 |
2157 | msgid "<literal>Debug::pkgAcquire::Worker</literal>" |
2158 | msgstr "<literal>Debug::pkgAcquire::Worker</literal>" |
2159 | |
2160 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2161 | -#: apt.conf.5.xml:862 |
2162 | +#: apt.conf.5.xml:871 |
2163 | msgid "" |
2164 | "Log all interactions with the sub-processes that actually perform downloads." |
2165 | msgstr "" |
2166 | @@ -7767,12 +7786,12 @@ |
2167 | "durchführen." |
2168 | |
2169 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2170 | -#: apt.conf.5.xml:869 |
2171 | +#: apt.conf.5.xml:878 |
2172 | msgid "<literal>Debug::pkgAutoRemove</literal>" |
2173 | msgstr "<literal>Debug::pkgAutoRemove</literal>" |
2174 | |
2175 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2176 | -#: apt.conf.5.xml:873 |
2177 | +#: apt.conf.5.xml:882 |
2178 | msgid "" |
2179 | "Log events related to the automatically-installed status of packages and to " |
2180 | "the removal of unused packages." |
2181 | @@ -7782,12 +7801,12 @@ |
2182 | "beziehen." |
2183 | |
2184 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2185 | -#: apt.conf.5.xml:880 |
2186 | +#: apt.conf.5.xml:889 |
2187 | msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" |
2188 | msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" |
2189 | |
2190 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2191 | -#: apt.conf.5.xml:883 |
2192 | +#: apt.conf.5.xml:892 |
2193 | msgid "" |
2194 | "Generate debug messages describing which packages are being automatically " |
2195 | "installed to resolve dependencies. This corresponds to the initial auto-" |
2196 | @@ -7803,12 +7822,12 @@ |
2197 | "literal>." |
2198 | |
2199 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2200 | -#: apt.conf.5.xml:894 |
2201 | +#: apt.conf.5.xml:903 |
2202 | msgid "<literal>Debug::pkgDepCache::Marker</literal>" |
2203 | msgstr "<literal>Debug::pkgDepCache::Marker</literal>" |
2204 | |
2205 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2206 | -#: apt.conf.5.xml:897 |
2207 | +#: apt.conf.5.xml:906 |
2208 | msgid "" |
2209 | "Generate debug messages describing which package is marked as keep/install/" |
2210 | "remove while the ProblemResolver does his work. Each addition or deletion " |
2211 | @@ -7840,23 +7859,23 @@ |
2212 | "erscheint." |
2213 | |
2214 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2215 | -#: apt.conf.5.xml:916 |
2216 | +#: apt.conf.5.xml:925 |
2217 | msgid "<literal>Debug::pkgInitConfig</literal>" |
2218 | msgstr "<literal>Debug::pkgInitConfig</literal>" |
2219 | |
2220 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2221 | -#: apt.conf.5.xml:919 |
2222 | +#: apt.conf.5.xml:928 |
2223 | msgid "Dump the default configuration to standard error on startup." |
2224 | msgstr "" |
2225 | "Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben." |
2226 | |
2227 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2228 | -#: apt.conf.5.xml:926 |
2229 | +#: apt.conf.5.xml:935 |
2230 | msgid "<literal>Debug::pkgDPkgPM</literal>" |
2231 | msgstr "<literal>Debug::pkgDPkgPM</literal>" |
2232 | |
2233 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2234 | -#: apt.conf.5.xml:929 |
2235 | +#: apt.conf.5.xml:938 |
2236 | msgid "" |
2237 | "When invoking &dpkg;, output the precise command line with which it is being " |
2238 | "invoked, with arguments separated by a single space character." |
2239 | @@ -7866,12 +7885,12 @@ |
2240 | "sind." |
2241 | |
2242 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2243 | -#: apt.conf.5.xml:937 |
2244 | +#: apt.conf.5.xml:946 |
2245 | msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" |
2246 | msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" |
2247 | |
2248 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2249 | -#: apt.conf.5.xml:940 |
2250 | +#: apt.conf.5.xml:949 |
2251 | msgid "" |
2252 | "Output all the data received from &dpkg; on the status file descriptor and " |
2253 | "any errors encountered while parsing it." |
2254 | @@ -7880,12 +7899,12 @@ |
2255 | "alle während deren Auswertung gefundenen Fehler ausgeben." |
2256 | |
2257 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2258 | -#: apt.conf.5.xml:947 |
2259 | +#: apt.conf.5.xml:956 |
2260 | msgid "<literal>Debug::pkgOrderList</literal>" |
2261 | msgstr "<literal>Debug::pkgOrderList</literal>" |
2262 | |
2263 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2264 | -#: apt.conf.5.xml:951 |
2265 | +#: apt.conf.5.xml:960 |
2266 | msgid "" |
2267 | "Generate a trace of the algorithm that decides the order in which " |
2268 | "<literal>apt</literal> should pass packages to &dpkg;." |
2269 | @@ -7895,12 +7914,12 @@ |
2270 | "soll." |
2271 | |
2272 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2273 | -#: apt.conf.5.xml:959 |
2274 | +#: apt.conf.5.xml:968 |
2275 | msgid "<literal>Debug::pkgPackageManager</literal>" |
2276 | msgstr "<literal>Debug::pkgPackageManager</literal>" |
2277 | |
2278 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2279 | -#: apt.conf.5.xml:963 |
2280 | +#: apt.conf.5.xml:972 |
2281 | msgid "" |
2282 | "Output status messages tracing the steps performed when invoking &dpkg;." |
2283 | msgstr "" |
2284 | @@ -7908,22 +7927,22 @@ |
2285 | "von &dpkg; ausgeführt werden." |
2286 | |
2287 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2288 | -#: apt.conf.5.xml:970 |
2289 | +#: apt.conf.5.xml:979 |
2290 | msgid "<literal>Debug::pkgPolicy</literal>" |
2291 | msgstr "<literal>Debug::pkgPolicy</literal>" |
2292 | |
2293 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2294 | -#: apt.conf.5.xml:974 |
2295 | +#: apt.conf.5.xml:983 |
2296 | msgid "Output the priority of each package list on startup." |
2297 | msgstr "Die Priorität jeder Paketliste beim Start ausgeben." |
2298 | |
2299 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2300 | -#: apt.conf.5.xml:980 |
2301 | +#: apt.conf.5.xml:989 |
2302 | msgid "<literal>Debug::pkgProblemResolver</literal>" |
2303 | msgstr "<literal>Debug::pkgProblemResolver</literal>" |
2304 | |
2305 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2306 | -#: apt.conf.5.xml:984 |
2307 | +#: apt.conf.5.xml:993 |
2308 | msgid "" |
2309 | "Trace the execution of the dependency resolver (this applies only to what " |
2310 | "happens when a complex dependency problem is encountered)." |
2311 | @@ -7933,12 +7952,12 @@ |
2312 | "aufgetreten ist)." |
2313 | |
2314 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2315 | -#: apt.conf.5.xml:992 |
2316 | +#: apt.conf.5.xml:1001 |
2317 | msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" |
2318 | msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" |
2319 | |
2320 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2321 | -#: apt.conf.5.xml:995 |
2322 | +#: apt.conf.5.xml:1004 |
2323 | msgid "" |
2324 | "Display a list of all installed packages with their calculated score used by " |
2325 | "the pkgProblemResolver. The description of the package is the same as " |
2326 | @@ -7950,12 +7969,12 @@ |
2327 | "beschrieben." |
2328 | |
2329 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> |
2330 | -#: apt.conf.5.xml:1003 |
2331 | +#: apt.conf.5.xml:1012 |
2332 | msgid "<literal>Debug::sourceList</literal>" |
2333 | msgstr "<literal>Debug::sourceList</literal>" |
2334 | |
2335 | #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |
2336 | -#: apt.conf.5.xml:1007 |
2337 | +#: apt.conf.5.xml:1016 |
2338 | msgid "" |
2339 | "Print information about the vendors read from <filename>/etc/apt/vendors." |
2340 | "list</filename>." |
2341 | @@ -7964,7 +7983,7 @@ |
2342 | "gelesenen Anbieter ausgeben." |
2343 | |
2344 | #. type: Content of: <refentry><refsect1><para> |
2345 | -#: apt.conf.5.xml:1030 |
2346 | +#: apt.conf.5.xml:1039 |
2347 | msgid "" |
2348 | "&configureindex; is a configuration file showing example values for all " |
2349 | "possible options." |
2350 | @@ -7973,13 +7992,13 @@ |
2351 | "möglichen Optionen zeigen." |
2352 | |
2353 | #. type: Content of: <refentry><refsect1><variablelist> |
2354 | -#: apt.conf.5.xml:1037 |
2355 | +#: apt.conf.5.xml:1046 |
2356 | msgid "&file-aptconf;" |
2357 | msgstr "&file-aptconf;" |
2358 | |
2359 | #. ? reading apt.conf |
2360 | #. type: Content of: <refentry><refsect1><para> |
2361 | -#: apt.conf.5.xml:1042 |
2362 | +#: apt.conf.5.xml:1051 |
2363 | msgid "&apt-cache;, &apt-config;, &apt-preferences;." |
2364 | msgstr "&apt-cache;, &apt-config;, &apt-preferences;." |
2365 | |
2366 | |
2367 | === modified file 'methods/gzip.cc' |
2368 | --- methods/gzip.cc 2006-12-14 11:07:24 +0000 |
2369 | +++ methods/gzip.cc 2010-07-06 11:16:27 +0000 |
2370 | @@ -23,8 +23,6 @@ |
2371 | #include <apti18n.h> |
2372 | /*}}}*/ |
2373 | |
2374 | -const char *Prog; |
2375 | - |
2376 | class GzipMethod : public pkgAcqMethod |
2377 | { |
2378 | virtual bool Fetch(FetchItem *Itm); |
2379 | @@ -43,14 +41,12 @@ |
2380 | URI Get = Itm->Uri; |
2381 | string Path = Get.Host + Get.Path; // To account for relative paths |
2382 | |
2383 | - string GzPathOption = "Dir::bin::"+string(Prog); |
2384 | - |
2385 | FetchResult Res; |
2386 | Res.Filename = Itm->DestFile; |
2387 | URIStart(Res); |
2388 | |
2389 | // Open the source and destination files |
2390 | - FileFd From(Path,FileFd::ReadOnly); |
2391 | + FileFd From(Path,FileFd::ReadOnlyGzip); |
2392 | |
2393 | // if the file is empty, just rename it and return |
2394 | if(From.Size() == 0) |
2395 | @@ -59,40 +55,12 @@ |
2396 | return true; |
2397 | } |
2398 | |
2399 | - int GzOut[2]; |
2400 | - if (pipe(GzOut) < 0) |
2401 | - return _error->Errno("pipe",_("Couldn't open pipe for %s"),Prog); |
2402 | - |
2403 | - // Fork gzip |
2404 | - pid_t Process = ExecFork(); |
2405 | - if (Process == 0) |
2406 | - { |
2407 | - close(GzOut[0]); |
2408 | - dup2(From.Fd(),STDIN_FILENO); |
2409 | - dup2(GzOut[1],STDOUT_FILENO); |
2410 | - From.Close(); |
2411 | - close(GzOut[1]); |
2412 | - SetCloseExec(STDIN_FILENO,false); |
2413 | - SetCloseExec(STDOUT_FILENO,false); |
2414 | - |
2415 | - const char *Args[3]; |
2416 | - string Tmp = _config->Find(GzPathOption,Prog); |
2417 | - Args[0] = Tmp.c_str(); |
2418 | - Args[1] = "-d"; |
2419 | - Args[2] = 0; |
2420 | - execvp(Args[0],(char **)Args); |
2421 | - _exit(100); |
2422 | - } |
2423 | - From.Close(); |
2424 | - close(GzOut[1]); |
2425 | - |
2426 | - FileFd FromGz(GzOut[0]); // For autoclose |
2427 | FileFd To(Itm->DestFile,FileFd::WriteEmpty); |
2428 | To.EraseOnFailure(); |
2429 | if (_error->PendingError() == true) |
2430 | return false; |
2431 | |
2432 | - // Read data from gzip, generate checksums and write |
2433 | + // Read data from source, generate checksums and write |
2434 | Hashes Hash; |
2435 | bool Failed = false; |
2436 | while (1) |
2437 | @@ -100,36 +68,23 @@ |
2438 | unsigned char Buffer[4*1024]; |
2439 | unsigned long Count; |
2440 | |
2441 | - Count = read(GzOut[0],Buffer,sizeof(Buffer)); |
2442 | - if (Count < 0 && errno == EINTR) |
2443 | - continue; |
2444 | - |
2445 | - if (Count < 0) |
2446 | + if (!From.Read(Buffer,sizeof(Buffer),&Count)) |
2447 | { |
2448 | - _error->Errno("read", _("Read error from %s process"),Prog); |
2449 | - Failed = true; |
2450 | - break; |
2451 | + To.OpFail(); |
2452 | + return false; |
2453 | } |
2454 | - |
2455 | if (Count == 0) |
2456 | break; |
2457 | - |
2458 | + |
2459 | Hash.Add(Buffer,Count); |
2460 | if (To.Write(Buffer,Count) == false) |
2461 | { |
2462 | Failed = true; |
2463 | - FromGz.Close(); |
2464 | break; |
2465 | } |
2466 | } |
2467 | |
2468 | - // Wait for gzip to finish |
2469 | - if (ExecWait(Process,_config->Find(GzPathOption,Prog).c_str(),false) == false) |
2470 | - { |
2471 | - To.OpFail(); |
2472 | - return false; |
2473 | - } |
2474 | - |
2475 | + From.Close(); |
2476 | To.Close(); |
2477 | |
2478 | if (Failed == true) |
2479 | @@ -165,9 +120,5 @@ |
2480 | setlocale(LC_ALL, ""); |
2481 | |
2482 | GzipMethod Mth; |
2483 | - |
2484 | - Prog = strrchr(argv[0],'/'); |
2485 | - Prog++; |
2486 | - |
2487 | return Mth.Run(); |
2488 | } |
2489 | |
2490 | === added file 'test/test-indexes.sh' |
2491 | --- test/test-indexes.sh 1970-01-01 00:00:00 +0000 |
2492 | +++ test/test-indexes.sh 2010-07-06 11:16:27 +0000 |
2493 | @@ -0,0 +1,226 @@ |
2494 | +#!/bin/sh -e |
2495 | + |
2496 | +# Test behaviour of index retrieval and usage, in particular with uncompressed |
2497 | +# and gzip compressed indexes. |
2498 | +# Author: Martin Pitt <martin.pitt@ubuntu.com> |
2499 | +# (C) 2010 Canonical Ltd. |
2500 | + |
2501 | +BUILDDIR=$(readlink -f $(dirname $0)/../build) |
2502 | + |
2503 | +TEST_SOURCE="http://ftp.debian.org/debian unstable contrib" |
2504 | +GPG_KEYSERVER=gpg-keyserver.de |
2505 | +# should be a small package with dependencies satisfiable in TEST_SOURCE, i. e. |
2506 | +# ideally no depends at all |
2507 | +TEST_PKG="python-psyco-doc" |
2508 | + |
2509 | +export LD_LIBRARY_PATH=$BUILDDIR/bin |
2510 | + |
2511 | +OPTS="-qq -o Dir::Bin::Methods=$BUILDDIR/bin/methods -o Debug::NoLocking=true" |
2512 | +DEBUG="" |
2513 | +#DEBUG="-o Debug::pkgCacheGen=true" |
2514 | +#DEBUG="-o Debug::pkgAcquire=true" |
2515 | +APT_GET="$BUILDDIR/bin/apt-get $OPTS $DEBUG" |
2516 | +APT_CACHE="$BUILDDIR/bin/apt-cache $OPTS $DEBUG" |
2517 | +APT_FTPARCHIVE="$BUILDDIR/bin/apt-ftparchive" |
2518 | + |
2519 | +[ -x "$BUILDDIR/bin/apt-get" ] || { |
2520 | + echo "please build the tree first" >&2 |
2521 | + exit 1 |
2522 | +} |
2523 | + |
2524 | +check_update() { |
2525 | + echo "--- apt-get update $@ (no trusted keys)" |
2526 | + |
2527 | + rm -f etc/apt/trusted.gpg etc/apt/secring.gpg |
2528 | + touch etc/apt/trusted.gpg etc/apt/secring.gpg |
2529 | + find var/lib/apt/lists/ -type f | xargs -r rm |
2530 | + |
2531 | + # first attempt should fail, no trusted GPG key |
2532 | + out=$($APT_GET "$@" update 2>&1) |
2533 | + echo "$out" | grep -q NO_PUBKEY |
2534 | + key=$(echo "$out" | sed -n '/NO_PUBKEY/ { s/^.*NO_PUBKEY \([[:alnum:]]\+\)$/\1/; p}') |
2535 | + |
2536 | + # get keyring |
2537 | + gpg -q --no-options --no-default-keyring --secret-keyring etc/apt/secring.gpg --trustdb-name etc/apt/trustdb.gpg --keyring etc/apt/trusted.gpg --primary-keyring etc/apt/trusted.gpg --keyserver $GPG_KEYSERVER --recv-keys $key |
2538 | + |
2539 | + # now it should work |
2540 | + echo "--- apt-get update $@ (with trusted keys)" |
2541 | + find var/lib/apt/lists/ -type f | xargs -r rm |
2542 | + $APT_GET "$@" update |
2543 | +} |
2544 | + |
2545 | +# if $1 == "compressed", check that we have compressed indexes, otherwise |
2546 | +# uncompressed ones |
2547 | +check_indexes() { |
2548 | + echo "--- only ${1:-uncompressed} index files present" |
2549 | + local F |
2550 | + if [ "$1" = "compressed" ]; then |
2551 | + ! test -e var/lib/apt/lists/*_Packages || F=1 |
2552 | + ! test -e var/lib/apt/lists/*_Sources || F=1 |
2553 | + test -e var/lib/apt/lists/*_Packages.gz || F=1 |
2554 | + test -e var/lib/apt/lists/*_Sources.gz || F=1 |
2555 | + else |
2556 | + test -e var/lib/apt/lists/*_Packages || F=1 |
2557 | + test -e var/lib/apt/lists/*_Sources || F=1 |
2558 | + ! test -e var/lib/apt/lists/*_Packages.gz || F=1 |
2559 | + ! test -e var/lib/apt/lists/*_Sources.gz || F=1 |
2560 | + fi |
2561 | + |
2562 | + if [ -n "$F" ]; then |
2563 | + ls -laR var/lib/apt/lists/ |
2564 | + exit 1 |
2565 | + fi |
2566 | +} |
2567 | + |
2568 | +# test apt-cache commands |
2569 | +check_cache() { |
2570 | + echo "--- apt-cache commands" |
2571 | + |
2572 | + $APT_CACHE show $TEST_PKG | grep -q ^Version: |
2573 | + # again (with cache) |
2574 | + $APT_CACHE show $TEST_PKG | grep -q ^Version: |
2575 | + rm var/cache/apt/*.bin |
2576 | + $APT_CACHE policy $TEST_PKG | egrep -q '500 (http://|file:/)' |
2577 | + # again (with cache) |
2578 | + $APT_CACHE policy $TEST_PKG | egrep -q '500 (http://|file:/)' |
2579 | + |
2580 | + TEST_SRC=`$APT_CACHE show $TEST_PKG | grep ^Source: | awk '{print $2}'` |
2581 | + rm var/cache/apt/*.bin |
2582 | + $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: |
2583 | + # again (with cache) |
2584 | + $APT_CACHE showsrc $TEST_SRC | grep -q ^Binary: |
2585 | +} |
2586 | + |
2587 | +# test apt-get install |
2588 | +check_install() { |
2589 | + echo "--- apt-get install" |
2590 | + |
2591 | + $APT_GET install -d $TEST_PKG |
2592 | + test -e var/cache/apt/archives/$TEST_PKG*.deb |
2593 | + $APT_GET clean |
2594 | + ! test -e var/cache/apt/archives/$TEST_PKG*.deb |
2595 | +} |
2596 | + |
2597 | +# test apt-get source |
2598 | +check_get_source() { |
2599 | + echo "--- apt-get source" |
2600 | + # quiesce: it'll complain about not being able to verify the signature |
2601 | + $APT_GET source $TEST_PKG >/dev/null 2>&1 |
2602 | + test -f $TEST_SRC_*.dsc |
2603 | + test -d $TEST_SRC-* |
2604 | + rm -r $TEST_SRC* |
2605 | +} |
2606 | + |
2607 | +############################################################################ |
2608 | +# main |
2609 | +############################################################################ |
2610 | + |
2611 | +echo "===== building sandbox =====" |
2612 | +WORKDIR=$(mktemp -d) |
2613 | +trap "cd /; rm -rf $WORKDIR" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM |
2614 | +cd $WORKDIR |
2615 | + |
2616 | +rm -fr etc var |
2617 | +rm -f home |
2618 | +ln -s /home home |
2619 | +mkdir -p etc/apt/preferences.d etc/apt/trusted.gpg.d etc/apt/apt.conf.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/dpkg |
2620 | +cp /etc/apt/trusted.gpg etc/apt |
2621 | +touch var/lib/dpkg/status |
2622 | +echo "deb $TEST_SOURCE" > etc/apt/sources.list |
2623 | +echo "deb-src $TEST_SOURCE" >> etc/apt/sources.list |
2624 | + |
2625 | +# specifying -o RootDir at the command line does not work for |
2626 | +# etc/apt/apt.conf.d/ since it is parsed after pkgInitConfig(); $APT_CONFIG is |
2627 | +# checked first, so this works |
2628 | +echo "RootDir \"$WORKDIR\";" > apt_config |
2629 | +export APT_CONFIG=`pwd`/apt_config |
2630 | + |
2631 | +echo "===== uncompressed indexes =====" |
2632 | +check_update |
2633 | +check_indexes |
2634 | +check_cache |
2635 | +check_install |
2636 | +check_get_source |
2637 | + |
2638 | +echo "--- apt-get update with preexisting indexes" |
2639 | +$APT_GET update |
2640 | +check_indexes |
2641 | +check_cache |
2642 | + |
2643 | +echo "--- apt-get update with preexisting indexes and pdiff mode" |
2644 | +$APT_GET -o Acquire::PDiffs=true update |
2645 | +check_indexes |
2646 | +check_cache |
2647 | + |
2648 | +echo "===== compressed indexes (CLI option) =====" |
2649 | +check_update -o Acquire::GzipIndexes=true |
2650 | +check_indexes compressed |
2651 | +check_cache |
2652 | +check_install |
2653 | +check_get_source |
2654 | + |
2655 | +echo "--- apt-get update with preexisting indexes" |
2656 | +$APT_GET -o Acquire::GzipIndexes=true update |
2657 | +check_indexes compressed |
2658 | +check_cache |
2659 | + |
2660 | +echo "--- apt-get update with preexisting indexes and pdiff mode" |
2661 | +$APT_GET -o Acquire::GzipIndexes=true -o Acquire::PDiffs=true update |
2662 | +check_indexes compressed |
2663 | +check_cache |
2664 | + |
2665 | +echo "===== compressed indexes (apt.conf.d option) =====" |
2666 | +cat <<EOF > etc/apt/apt.conf.d/02compress-indexes |
2667 | +Acquire::GzipIndexes "true"; |
2668 | +Acquire::CompressionTypes::Order:: "gz"; |
2669 | +EOF |
2670 | + |
2671 | +check_update |
2672 | +check_indexes compressed |
2673 | +check_cache |
2674 | +check_install |
2675 | +check_get_source |
2676 | + |
2677 | +echo "--- apt-get update with preexisting indexes" |
2678 | +$APT_GET update |
2679 | +check_indexes compressed |
2680 | +check_cache |
2681 | + |
2682 | +echo "--- apt-get update with preexisting indexes and pdiff mode" |
2683 | +$APT_GET -o Acquire::PDiffs=true update |
2684 | +check_indexes compressed |
2685 | +check_cache |
2686 | + |
2687 | +rm etc/apt/apt.conf.d/02compress-indexes |
2688 | + |
2689 | +echo "==== apt-ftparchive ====" |
2690 | +mkdir arch |
2691 | +$APT_GET install -d $TEST_PKG |
2692 | +cp var/cache/apt/archives/$TEST_PKG*.deb arch/ |
2693 | +cd arch |
2694 | +$APT_GET source -d $TEST_PKG >/dev/null 2>&1 |
2695 | +$APT_FTPARCHIVE packages . | gzip -9 > Packages.gz |
2696 | +$APT_FTPARCHIVE sources . | gzip -9 > Sources.gz |
2697 | +cd .. |
2698 | + |
2699 | +echo "deb file://$WORKDIR/arch / |
2700 | +deb-src file://$WORKDIR/arch /" > etc/apt/sources.list |
2701 | +$APT_GET clean |
2702 | + |
2703 | +echo "==== uncompressed indexes from local file:// archive ====" |
2704 | +echo "--- apt-get update" |
2705 | +$APT_GET update |
2706 | +check_indexes |
2707 | +check_cache |
2708 | +check_get_source |
2709 | + |
2710 | +echo "==== compressed indexes from local file:// archive ====" |
2711 | +echo "--- apt-get update" |
2712 | +$APT_GET -o Acquire::GzipIndexes=true update |
2713 | +# EXFAIL: file:/ URIs currently decompress even with above option |
2714 | +#check_indexes compressed |
2715 | +check_indexes |
2716 | +check_cache |
2717 | +check_get_source |
2718 | + |
2719 | +echo "===== ALL TESTS PASSED =====" |
I previously missed the case of already existing up-to-date indexes (IMS Cache hit). I greatly extended and cleaned up the test suite, and fixed that bug as well.