APT

Merge lp:~mvo/apt/mvo into lp:~pitti/apt/compressed-indexes

  1. mvo
  2. Merge into compressed-indexes
Proposed by Michael Vogt
Status: Merged
Merged at revision: 2036
Proposed branch: lp:~mvo/apt/mvo
Merge into: lp:~pitti/apt/compressed-indexes
Diff against target: 443 lines (+76/-48)
14 files modified
apt-pkg/contrib/fileutl.cc (+10/-5)
doc/po/fr.po (+54/-32)
test/integration/framework (+1/-0)
test/integration/run-tests (+1/-1)
test/integration/test-autoremove (+1/-1)
test/integration/test-bug-590438-broken-provides-thanks-to-remove-order (+1/-1)
test/integration/test-bug-591882-conkeror (+1/-1)
test/integration/test-bug-595691-empty-and-broken-archive-files (+1/-1)
test/integration/test-bug-598669-install-postfix-gets-exim-heavy (+1/-1)
test/integration/test-compressed-indexes (+1/-1)
test/integration/test-disappearing-packages (+1/-1)
test/integration/test-pdiff-usage (+1/-1)
test/integration/test-policy-pinning (+1/-1)
test/integration/test-ubuntu-bug-614993 (+1/-1)
To merge this branch: bzr merge lp:~mvo/apt/mvo
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+38330@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apt-pkg/contrib/fileutl.cc'
2--- apt-pkg/contrib/fileutl.cc 2010-10-13 11:00:49 +0000
3+++ apt-pkg/contrib/fileutl.cc 2010-10-13 18:37:38 +0000
4@@ -916,10 +916,17 @@
5 unsigned long FileFd::Size()
6 {
7 struct stat Buf;
8- long size;
9+ unsigned long size;
10 off_t orig_pos;
11
12- if (gz)
13+ if (fstat(iFd,&Buf) != 0)
14+ return _error->Errno("fstat","Unable to determine the file size");
15+ size = Buf.st_size;
16+
17+ // only check gzsize if we are actually a gzip file, just checking for
18+ // "gz" is not sufficient as uncompressed files will be opened with
19+ // gzopen in "direct" mode as well
20+ if (gz && !gzdirect(gz) && size > 0)
21 {
22 /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do
23 * this ourselves; the original (uncompressed) file size is the last 32
24@@ -936,9 +943,7 @@
25 return size;
26 }
27
28- if (fstat(iFd,&Buf) != 0)
29- return _error->Errno("fstat","Unable to determine the file size");
30- return Buf.st_size;
31+ return size;
32 }
33 /*}}}*/
34 // FileFd::Close - Close the file if the close flag is set /*{{{*/
35
36=== modified file 'doc/po/fr.po'
37--- doc/po/fr.po 2010-10-06 20:35:27 +0000
38+++ doc/po/fr.po 2010-10-13 18:37:38 +0000
39@@ -1154,7 +1154,7 @@
40 "<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
41 "ENTITY testing-codename \"squeeze\">"
42
43-#. The last update date
44+#. The last update date
45 #. type: Content of: <refentry><refentryinfo>
46 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
47 #: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
48@@ -2586,7 +2586,7 @@
49 "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
50 "le nombre 100 en cas d'erreur."
51
52-#. The last update date
53+#. The last update date
54 #. type: Content of: <refentry><refentryinfo>
55 #: apt-ftparchive.1.xml:13
56 msgid ""
57@@ -2712,7 +2712,8 @@
58
59 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
60 #: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107
61-msgid "The option <option>--db</option> can be used to specify a binary caching DB."
62+msgid ""
63+"The option <option>--db</option> can be used to specify a binary caching DB."
64 msgstr ""
65 "On peut se servir de l'option <option>--db</option> pour demander un cache "
66 "binaire."
67@@ -2869,8 +2870,10 @@
68
69 #. type: Content of: <refentry><refsect1><para>
70 #: apt-ftparchive.1.xml:157
71-msgid "The generate configuration has 4 separate sections, each described below."
72-msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
73+msgid ""
74+"The generate configuration has 4 separate sections, each described below."
75+msgstr ""
76+"Ce fichier de configuration possède quatre sections, décrites ci-dessous."
77
78 #. type: Content of: <refentry><refsect1><refsect2><title>
79 #: apt-ftparchive.1.xml:159
80@@ -3828,7 +3831,7 @@
81 "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
82 "nombre 100 en cas d'erreur."
83
84-#. The last update date
85+#. The last update date
86 #. type: Content of: <refentry><refentryinfo>
87 #: apt-get.8.xml:13
88 msgid ""
89@@ -3846,7 +3849,8 @@
90 #. type: Content of: <refentry><refnamediv><refpurpose>
91 #: apt-get.8.xml:30
92 msgid "APT package handling utility -- command-line interface"
93-msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
94+msgstr ""
95+"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
96
97 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
98 #: apt-get.8.xml:36
99@@ -5200,8 +5204,10 @@
100
101 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
102 #: apt-key.8.xml:166
103-msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
104-msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
105+msgid ""
106+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
107+msgstr ""
108+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
109
110 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
111 #: apt-key.8.xml:167
112@@ -5213,7 +5219,7 @@
113 msgid "&apt-get;, &apt-secure;"
114 msgstr "&apt-get;, &apt-secure;"
115
116-#. The last update date
117+#. The last update date
118 #. type: Content of: <refentry><refentryinfo>
119 #: apt-mark.8.xml:13
120 msgid ""
121@@ -5318,13 +5324,15 @@
122 "<literal>showauto</literal> is used to print a list of automatically "
123 "installed packages with each package on a new line."
124 msgstr ""
125-"<literal>showauto</literal>, affiche les paquets installés automatiquement, un "
126-"paquet par ligne."
127+"<literal>showauto</literal>, affiche les paquets installés automatiquement, "
128+"un paquet par ligne."
129
130 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
131 #: apt-mark.8.xml:93
132-msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
133-msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
134+msgid ""
135+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
136+msgstr ""
137+"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
138
139 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
140 #: apt-mark.8.xml:94
141@@ -5773,7 +5781,7 @@
142 "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
143 "en cas d'erreur."
144
145-#. The last update date
146+#. The last update date
147 #. type: Content of: <refentry><refentryinfo>
148 #: apt.conf.5.xml:13
149 msgid ""
150@@ -5851,8 +5859,10 @@
151
152 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
153 #: apt.conf.5.xml:54
154-msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
155-msgstr "le fichier de configuration défini par <literal>Dir::Etc::Main</literal>"
156+msgid ""
157+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
158+msgstr ""
159+"le fichier de configuration défini par <literal>Dir::Etc::Main</literal>"
160
161 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
162 #: apt.conf.5.xml:56
163@@ -7671,7 +7681,7 @@
164
165 #. TODO: provide a
166 #. motivating example, except I haven't a clue why you'd want
167-#. to do this.
168+#. to do this.
169 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
170 #: apt.conf.5.xml:746
171 msgid ""
172@@ -7693,7 +7703,8 @@
173
174 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
175 #: apt.conf.5.xml:765
176-msgid "Print information related to accessing <literal>cdrom://</literal> sources."
177+msgid ""
178+"Print information related to accessing <literal>cdrom://</literal> sources."
179 msgstr ""
180 "Affiche les informations concernant les sources de type <literal>cdrom://</"
181 "literal>"
182@@ -7706,7 +7717,8 @@
183 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
184 #: apt.conf.5.xml:776
185 msgid "Print information related to downloading packages using FTP."
186-msgstr "Affiche les informations concernant le téléchargement de paquets par FTP."
187+msgstr ""
188+"Affiche les informations concernant le téléchargement de paquets par FTP."
189
190 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
191 #: apt.conf.5.xml:783
192@@ -7716,7 +7728,8 @@
193 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
194 #: apt.conf.5.xml:787
195 msgid "Print information related to downloading packages using HTTP."
196-msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP."
197+msgstr ""
198+"Affiche les informations concernant le téléchargement de paquets par HTTP."
199
200 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
201 #: apt.conf.5.xml:794
202@@ -7877,7 +7890,8 @@
203
204 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
205 #: apt.conf.5.xml:916
206-msgid "Log all interactions with the sub-processes that actually perform downloads."
207+msgid ""
208+"Log all interactions with the sub-processes that actually perform downloads."
209 msgstr ""
210 "Affiche toutes les interactions avec les processus enfants qui se chargent "
211 "effectivement des téléchargements."
212@@ -8018,7 +8032,8 @@
213
214 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
215 #: apt.conf.5.xml:1017
216-msgid "Output status messages tracing the steps performed when invoking &dpkg;."
217+msgid ""
218+"Output status messages tracing the steps performed when invoking &dpkg;."
219 msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
220
221 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
222@@ -8089,17 +8104,19 @@
223 msgid "&file-aptconf;"
224 msgstr "&file-aptconf;"
225
226-#. ? reading apt.conf
227+#. ? reading apt.conf
228 #. type: Content of: <refentry><refsect1><para>
229 #: apt.conf.5.xml:1096
230 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
231 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
232
233-#. The last update date
234+#. The last update date
235 #. type: Content of: <refentry><refentryinfo>
236 #: apt_preferences.5.xml:13
237-msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
238-msgstr "&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>"
239+msgid ""
240+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
241+msgstr ""
242+"&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>"
243
244 #. type: Content of: <refentry><refnamediv><refname>
245 #: apt_preferences.5.xml:21 apt_preferences.5.xml:28
246@@ -8288,7 +8305,8 @@
247
248 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
249 #: apt_preferences.5.xml:118
250-msgid "to the versions that are not installed and belong to the target release."
251+msgid ""
252+"to the versions that are not installed and belong to the target release."
253 msgstr ""
254 "est affectée aux versions qui ne sont pas installées et qui appartiennent à "
255 "la distribution par défaut."
256@@ -8803,7 +8821,8 @@
257 #. type: Content of: <refentry><refsect1><refsect2><title>
258 #: apt_preferences.5.xml:339
259 msgid "Determination of Package Version and Distribution Properties"
260-msgstr "Détermination de la version des paquets et des propriétés des distributions"
261+msgstr ""
262+"Détermination de la version des paquets et des propriétés des distributions"
263
264 #. type: Content of: <refentry><refsect1><refsect2><para>
265 #: apt_preferences.5.xml:341
266@@ -9875,7 +9894,8 @@
267
268 #. type: <abstract></abstract>
269 #: guide.sgml:11
270-msgid "This document provides an overview of how to use the the APT package manager."
271+msgid ""
272+"This document provides an overview of how to use the the APT package manager."
273 msgstr ""
274 "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
275 "paquets APT."
276@@ -10781,8 +10801,10 @@
277
278 #. type: <p></p>
279 #: guide.sgml:447
280-msgid "Finally, APT will print out a summary of all the changes that will occur."
281-msgstr "Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
282+msgid ""
283+"Finally, APT will print out a summary of all the changes that will occur."
284+msgstr ""
285+"Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
286
287 #. type: <example></example>
288 #: guide.sgml:452
289
290=== modified file 'test/integration/framework'
291--- test/integration/framework 2010-10-13 11:38:13 +0000
292+++ test/integration/framework 2010-10-13 18:37:38 +0000
293@@ -113,6 +113,7 @@
294 cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
295 ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
296 echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
297+ echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
298 echo "Debug::NoLocking \"true\";" >> aptconfig.conf
299 echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
300 echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf
301
302=== modified file 'test/integration/run-tests'
303--- test/integration/run-tests 2010-07-25 17:51:53 +0000
304+++ test/integration/run-tests 2010-10-13 18:37:38 +0000
305@@ -1,7 +1,7 @@
306 #!/bin/sh
307 set -e
308
309-local DIR=$(readlink -f $(dirname $0))
310+DIR=$(readlink -f $(dirname $0))
311 for testcase in $(run-parts --list $DIR | grep '/test-'); do
312 echo "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m"
313 ${testcase}
314
315=== modified file 'test/integration/test-autoremove'
316--- test/integration/test-autoremove 2010-09-29 17:55:04 +0000
317+++ test/integration/test-autoremove 2010-10-13 18:37:38 +0000
318@@ -1,7 +1,7 @@
319 #!/bin/sh
320 set -e
321
322-local TESTDIR=$(readlink -f $(dirname $0))
323+TESTDIR=$(readlink -f $(dirname $0))
324 . $TESTDIR/framework
325 setupenvironment
326 configarchitecture 'i386'
327
328=== modified file 'test/integration/test-bug-590438-broken-provides-thanks-to-remove-order'
329--- test/integration/test-bug-590438-broken-provides-thanks-to-remove-order 2010-08-18 10:56:57 +0000
330+++ test/integration/test-bug-590438-broken-provides-thanks-to-remove-order 2010-10-13 18:37:38 +0000
331@@ -1,7 +1,7 @@
332 #!/bin/sh
333 set -e
334
335-local TESTDIR=$(readlink -f $(dirname $0))
336+TESTDIR=$(readlink -f $(dirname $0))
337 . $TESTDIR/framework
338
339 setupenvironment
340
341=== modified file 'test/integration/test-bug-591882-conkeror'
342--- test/integration/test-bug-591882-conkeror 2010-09-29 16:34:48 +0000
343+++ test/integration/test-bug-591882-conkeror 2010-10-13 18:37:38 +0000
344@@ -1,7 +1,7 @@
345 #!/bin/sh
346 set -e
347
348-local TESTDIR=$(readlink -f $(dirname $0))
349+TESTDIR=$(readlink -f $(dirname $0))
350 . $TESTDIR/framework
351 setupenvironment
352 configarchitecture "i386"
353
354=== modified file 'test/integration/test-bug-595691-empty-and-broken-archive-files'
355--- test/integration/test-bug-595691-empty-and-broken-archive-files 2010-09-29 16:34:48 +0000
356+++ test/integration/test-bug-595691-empty-and-broken-archive-files 2010-10-13 18:37:38 +0000
357@@ -1,7 +1,7 @@
358 #!/bin/sh
359 set -e
360
361-local TESTDIR=$(readlink -f $(dirname $0))
362+TESTDIR=$(readlink -f $(dirname $0))
363 . $TESTDIR/framework
364 setupenvironment
365 configarchitecture "i386"
366
367=== modified file 'test/integration/test-bug-598669-install-postfix-gets-exim-heavy'
368--- test/integration/test-bug-598669-install-postfix-gets-exim-heavy 2010-10-02 07:19:31 +0000
369+++ test/integration/test-bug-598669-install-postfix-gets-exim-heavy 2010-10-13 18:37:38 +0000
370@@ -1,7 +1,7 @@
371 #!/bin/sh
372 set -e
373
374-local TESTDIR=$(readlink -f $(dirname $0))
375+TESTDIR=$(readlink -f $(dirname $0))
376 . $TESTDIR/framework
377 setupenvironment
378 configarchitecture "i386"
379
380=== modified file 'test/integration/test-compressed-indexes'
381--- test/integration/test-compressed-indexes 2010-08-21 20:19:56 +0000
382+++ test/integration/test-compressed-indexes 2010-10-13 18:37:38 +0000
383@@ -1,7 +1,7 @@
384 #!/bin/sh
385 set -e
386
387-local TESTDIR=$(readlink -f $(dirname $0))
388+TESTDIR=$(readlink -f $(dirname $0))
389 . $TESTDIR/framework
390
391 setupenvironment
392
393=== modified file 'test/integration/test-disappearing-packages'
394--- test/integration/test-disappearing-packages 2010-08-20 17:09:16 +0000
395+++ test/integration/test-disappearing-packages 2010-10-13 18:37:38 +0000
396@@ -1,7 +1,7 @@
397 #!/bin/sh
398 set -e
399
400-local TESTDIR=$(readlink -f $(dirname $0))
401+TESTDIR=$(readlink -f $(dirname $0))
402 . $TESTDIR/framework
403 setupenvironment
404 configarchitecture "i386"
405
406=== modified file 'test/integration/test-pdiff-usage'
407--- test/integration/test-pdiff-usage 2010-08-21 20:19:56 +0000
408+++ test/integration/test-pdiff-usage 2010-10-13 18:37:38 +0000
409@@ -1,7 +1,7 @@
410 #!/bin/sh
411 set -e
412
413-local TESTDIR=$(readlink -f $(dirname $0))
414+TESTDIR=$(readlink -f $(dirname $0))
415 . $TESTDIR/framework
416
417 setupenvironment
418
419=== modified file 'test/integration/test-policy-pinning'
420--- test/integration/test-policy-pinning 2010-09-14 16:57:46 +0000
421+++ test/integration/test-policy-pinning 2010-10-13 18:37:38 +0000
422@@ -1,7 +1,7 @@
423 #!/bin/sh
424 set -e
425
426-local TESTDIR=$(readlink -f $(dirname $0))
427+TESTDIR=$(readlink -f $(dirname $0))
428 . $TESTDIR/framework
429
430 setupenvironment
431
432=== modified file 'test/integration/test-ubuntu-bug-614993'
433--- test/integration/test-ubuntu-bug-614993 2010-09-29 16:34:48 +0000
434+++ test/integration/test-ubuntu-bug-614993 2010-10-13 18:37:38 +0000
435@@ -1,7 +1,7 @@
436 #!/bin/sh
437 set -e
438
439-local TESTDIR=$(readlink -f $(dirname $0))
440+TESTDIR=$(readlink -f $(dirname $0))
441 . $TESTDIR/framework
442 setupenvironment
443 configarchitecture "amd64"

Subscribers

People subscribed via source and target branches

to all changes: