APT

Merge lp:~ulrik-sjolin/apt/devel into lp:~ubuntu-core-dev/apt/ubuntu

Proposed by Ulrik Sjölin
Status: Needs review
Proposed branch: lp:~ulrik-sjolin/apt/devel
Merge into: lp:~ubuntu-core-dev/apt/ubuntu
Diff against target: 1766 lines (+431/-281)
3 files modified
apt-pkg/algorithms.cc (+90/-1)
apt-pkg/algorithms.h (+4/-1)
po/apt-all.pot (+337/-279)
To merge this branch: bzr merge lp:~ulrik-sjolin/apt/devel
Reviewer Review Type Date Requested Status
Michael Vogt Needs Information
Michael Voight Pending
Review via email: mp+49773@code.launchpad.net

Description of the change

We experienced a few issues with libapt and or-dependencies. This patch takes care of our problems in that area. The patch also contains a fix for conflict resolution of virtual packages.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for your branch! Looks like a typo in my name (Michael Vo*ight* instead of Michael Vogt).

This is why I missed the code earlier, I'm having a look now.

Revision history for this message
Ulrik Sjölin (ulrik-sjolin) wrote :

There is a bug in the patch in that the recusion never ends if the package id is not found, which will cause apt to segfault. I will upload a fix to this patch ASAP.

Revision history for this message
Michael Vogt (mvo) wrote :

While doing a review of the outstanding branches I ran into this branch again.

Any news here?

review: Needs Information
Revision history for this message
Michael Voight (michael-voight) wrote :

I have no clue, but you should correct the email address you are sending
this to.
I suspect <email address hidden> is not correct, and you want to find
the correct email address for THAT Michael Voight

Michael Voight

On 3/1/2012 3:56 AM, Michael Vogt wrote:
> Review: Needs Information
>
> While doing a review of the outstanding branches I ran into this branch again.
>
> Any news here?

Unmerged revisions

1844. By Ulrik Sjölin

Fix for conflict resolution of virtual packages + better removal of packages

Fixed virtual package resolution so that virtual package
provider with highest score is choosen. Previously apt
chose first available package from list. This caused apt
to fail to resolve certain conflict situations. We encountered
this problem when we tried to create images for specific
variants in our system composition environment.

Go through the chain of installed packages and make sure that
packages that should not be installed are removed. This a particual
problem that shows up when working with or-packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apt-pkg/algorithms.cc'
2--- apt-pkg/algorithms.cc 2011-02-11 08:08:37 +0000
3+++ apt-pkg/algorithms.cc 2011-02-15 08:46:27 +0000
4@@ -732,8 +732,28 @@
5 if ((Cache[End] & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
6 break;
7
8+ // Find provider for virtual package with highest score.
9+ PkgIterator P = Start.TargetPkg();
10+ PrvIterator Provides = P.ProvidesList();
11+
12+ if (!Provides.end())
13+ {
14+ // Skip over indirect provisions of package that owns the dependency.
15+ // See pkgCache::DepIterator::SmartTargetPkg
16+ for (;!Provides.end() && Provides.OwnerPkg() == Start.ParentPkg(); Provides++);
17+
18+ // Loop through provider list and find package with highest score.
19+ while (!Provides.end())
20+ {
21+ if (Scores[Provides.OwnerPkg()->ID] > Scores[P->ID])
22+ {
23+ P = Provides.OwnerPkg();
24+ }
25+ Provides++;
26+ }
27+ }
28+
29 // Do not change protected packages
30- PkgIterator P = Start.SmartTargetPkg();
31 if ((Flags[P->ID] & Protected) == Protected)
32 {
33 if (Debug == true)
34@@ -794,6 +814,73 @@
35 clog << " Re-Instated " << Pkg.FullName(false) << endl;
36 return true;
37 }
38+
39+// This recursive routine checks to see that a dependency chain of the
40+// given package is going to be installed. If any package in the chain
41+// is not going to be installed the routine returns 0.
42+
43+int pkgProblemResolver::Cleanup(int packageID)
44+{
45+ for(PkgIterator DP = Cache.PkgBegin(); DP.end() == false; DP++)
46+ {
47+ if(DP->ID == packageID)
48+ {
49+ int num_childs = 0;
50+
51+ for(pkgCache::DepIterator dpI = DP.RevDependsList(); dpI.end() == false; dpI++)
52+ {
53+ num_childs++;
54+ if((Cache[DP].DepState & pkgDepCache::DepGInstall) == pkgDepCache::DepGInstall)
55+ {
56+ int ret = this->Cleanup(dpI.ParentPkg()->ID);
57+
58+ if(ret == 1)
59+ {
60+ return 1;
61+ }
62+ }
63+ }
64+
65+ if(num_childs == 0)
66+ {
67+ return 1;
68+ }
69+ }
70+ }
71+
72+ return 0;
73+}
74+
75+// The following routine is the entry point to remove packages that
76+// has dependencies that should be removed.
77+
78+void pkgProblemResolver::CleanupInstallations(void)
79+{
80+ for(PkgIterator DDP = Cache.PkgBegin(); DDP.end() == false; DDP++)
81+ {
82+ if(this->Cleanup(DDP->ID) == 0 && ((Flags[DDP->ID] & Protected) == 0))
83+ {
84+ for(PkgIterator DDP2 = Cache.PkgBegin(); DDP2.end() == false; DDP2++)
85+ {
86+ if(DDP2->ID == DDP->ID)
87+ {
88+ bool WasKept = Cache[DDP2].Keep();
89+
90+ if (WasKept == true)
91+ {
92+ Cache.MarkKeep(DDP2, false, false);
93+ }
94+ else
95+ {
96+ Cache.MarkDelete(DDP2);
97+ }
98+ }
99+ }
100+ }
101+ }
102+}
103+
104+
105 /*}}}*/
106 // ProblemResolver::Resolve - Run the resolution pass /*{{{*/
107 // ---------------------------------------------------------------------
108@@ -1227,6 +1314,8 @@
109 if (Debug == true)
110 clog << "Done" << endl;
111
112+ this->CleanupInstallations();
113+
114 if (Cache.BrokenCount() != 0)
115 {
116 // See if this is the result of a hold
117
118=== modified file 'apt-pkg/algorithms.h'
119--- apt-pkg/algorithms.h 2010-07-04 12:23:20 +0000
120+++ apt-pkg/algorithms.h 2011-02-15 08:46:27 +0000
121@@ -120,7 +120,10 @@
122
123 // Install all protected packages
124 void InstallProtect();
125-
126+
127+ void CleanupInstallations(void);
128+ int Cleanup(int packageID);
129+
130 pkgProblemResolver(pkgDepCache *Cache);
131 ~pkgProblemResolver();
132 };
133
134=== modified file 'po/apt-all.pot'
135--- po/apt-all.pot 2011-02-11 08:08:37 +0000
136+++ po/apt-all.pot 2011-02-15 08:46:27 +0000
137@@ -7,11 +7,10 @@
138 msgstr ""
139 "Project-Id-Version: PACKAGE VERSION\n"
140 "Report-Msgid-Bugs-To: \n"
141-"POT-Creation-Date: 2010-10-29 10:12-0400\n"
142+"POT-Creation-Date: 2011-02-15 07:06+0100\n"
143 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
144 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
145 "Language-Team: LANGUAGE <LL@li.org>\n"
146-"Language: \n"
147 "MIME-Version: 1.0\n"
148 "Content-Type: text/plain; charset=CHARSET\n"
149 "Content-Transfer-Encoding: 8bit\n"
150@@ -90,82 +89,80 @@
151 msgid "Total space accounted for: "
152 msgstr ""
153
154-#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
155+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142
156 #, c-format
157 msgid "Package file %s is out of sync."
158 msgstr ""
159
160-#: cmdline/apt-cache.cc:1273
161+#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1377
162+#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456
163+msgid "No packages found"
164+msgstr ""
165+
166+#: cmdline/apt-cache.cc:1221
167 msgid "You must give at least one search pattern"
168 msgstr ""
169
170-#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
171-#: cmdline/apt-cache.cc:1508
172-msgid "No packages found"
173-msgstr ""
174-
175-#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
176+#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440
177 #, c-format
178 msgid "Unable to locate package %s"
179 msgstr ""
180
181-#: cmdline/apt-cache.cc:1533
182+#: cmdline/apt-cache.cc:1481
183 msgid "Package files:"
184 msgstr ""
185
186-#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
187+#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1586
188 msgid "Cache is out of sync, can't x-ref a package file"
189 msgstr ""
190
191 #. Show any packages have explicit pins
192-#: cmdline/apt-cache.cc:1554
193+#: cmdline/apt-cache.cc:1502
194 msgid "Pinned packages:"
195 msgstr ""
196
197-#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
198+#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1566
199 msgid "(not found)"
200 msgstr ""
201
202-#: cmdline/apt-cache.cc:1575
203+#: cmdline/apt-cache.cc:1523
204 msgid " Installed: "
205 msgstr ""
206
207-#: cmdline/apt-cache.cc:1576
208+#: cmdline/apt-cache.cc:1524
209 msgid " Candidate: "
210 msgstr ""
211
212-#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
213+#: cmdline/apt-cache.cc:1548 cmdline/apt-cache.cc:1556
214 msgid "(none)"
215 msgstr ""
216
217-#: cmdline/apt-cache.cc:1615
218+#: cmdline/apt-cache.cc:1563
219 msgid " Package pin: "
220 msgstr ""
221
222 #. Show the priority tables
223-#: cmdline/apt-cache.cc:1624
224+#: cmdline/apt-cache.cc:1572
225 msgid " Version table:"
226 msgstr ""
227
228-#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
229+#: cmdline/apt-cache.cc:1686 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
230 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
231-#: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144
232+#: cmdline/apt-get.cc:3050 cmdline/apt-sortpkgs.cc:144
233 #, c-format
234 msgid "%s %s for %s compiled on %s %s\n"
235 msgstr ""
236
237-#: cmdline/apt-cache.cc:1745
238+#: cmdline/apt-cache.cc:1693
239 msgid ""
240 "Usage: apt-cache [options] command\n"
241-" apt-cache [options] add file1 [file2 ...]\n"
242 " apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
243 " apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
244 "\n"
245-"apt-cache is a low-level tool used to manipulate APT's binary\n"
246-"cache files, and query information from them\n"
247+"apt-cache is a low-level tool used to query information\n"
248+"from APT's binary cache files\n"
249 "\n"
250 "Commands:\n"
251-" add - Add a package file to the source cache\n"
252 " gencaches - Build both the package and source cache\n"
253 " showpkg - Show some general information for a single package\n"
254 " showsrc - Show source records\n"
255@@ -250,7 +247,7 @@
256 " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
257 msgstr ""
258
259-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
260+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1175
261 #, c-format
262 msgid "Unable to write to %s"
263 msgstr ""
264@@ -616,75 +613,70 @@
265 msgid "The following held packages will be changed:"
266 msgstr ""
267
268-#: cmdline/apt-get.cc:561
269+#: cmdline/apt-get.cc:563
270 #, c-format
271 msgid "%s (due to %s) "
272 msgstr ""
273
274-#: cmdline/apt-get.cc:569
275+#: cmdline/apt-get.cc:571
276 msgid ""
277 "WARNING: The following essential packages will be removed.\n"
278 "This should NOT be done unless you know exactly what you are doing!"
279 msgstr ""
280
281-#: cmdline/apt-get.cc:603
282+#: cmdline/apt-get.cc:605
283 #, c-format
284 msgid "%lu upgraded, %lu newly installed, "
285 msgstr ""
286
287-#: cmdline/apt-get.cc:607
288+#: cmdline/apt-get.cc:609
289 #, c-format
290 msgid "%lu reinstalled, "
291 msgstr ""
292
293-#: cmdline/apt-get.cc:609
294+#: cmdline/apt-get.cc:611
295 #, c-format
296 msgid "%lu downgraded, "
297 msgstr ""
298
299-#: cmdline/apt-get.cc:611
300+#: cmdline/apt-get.cc:613
301 #, c-format
302 msgid "%lu to remove and %lu not upgraded.\n"
303 msgstr ""
304
305-#: cmdline/apt-get.cc:615
306+#: cmdline/apt-get.cc:617
307 #, c-format
308 msgid "%lu not fully installed or removed.\n"
309 msgstr ""
310
311-#: cmdline/apt-get.cc:635
312+#: cmdline/apt-get.cc:639
313 #, c-format
314 msgid "Note, selecting '%s' for task '%s'\n"
315 msgstr ""
316
317-#: cmdline/apt-get.cc:641
318+#: cmdline/apt-get.cc:645
319 #, c-format
320 msgid "Note, selecting '%s' for regex '%s'\n"
321 msgstr ""
322
323-#: cmdline/apt-get.cc:648
324-#, c-format
325-msgid "Selected version '%s' (%s) for '%s'\n"
326-msgstr ""
327-
328-#: cmdline/apt-get.cc:658
329+#: cmdline/apt-get.cc:662
330 #, c-format
331 msgid "Package %s is a virtual package provided by:\n"
332 msgstr ""
333
334-#: cmdline/apt-get.cc:669
335+#: cmdline/apt-get.cc:673
336 msgid " [Installed]"
337 msgstr ""
338
339-#: cmdline/apt-get.cc:678
340+#: cmdline/apt-get.cc:682
341 msgid " [Not candidate version]"
342 msgstr ""
343
344-#: cmdline/apt-get.cc:680
345+#: cmdline/apt-get.cc:684
346 msgid "You should explicitly select one to install."
347 msgstr ""
348
349-#: cmdline/apt-get.cc:683
350+#: cmdline/apt-get.cc:687
351 #, c-format
352 msgid ""
353 "Package %s is not available, but is referred to by another package.\n"
354@@ -692,167 +684,177 @@
355 "is only available from another source\n"
356 msgstr ""
357
358-#: cmdline/apt-get.cc:701
359+#: cmdline/apt-get.cc:705
360 msgid "However the following packages replace it:"
361 msgstr ""
362
363-#: cmdline/apt-get.cc:713
364+#: cmdline/apt-get.cc:717
365 #, c-format
366 msgid "Package '%s' has no installation candidate"
367 msgstr ""
368
369-#: cmdline/apt-get.cc:724
370+#: cmdline/apt-get.cc:728
371 #, c-format
372 msgid "Virtual packages like '%s' can't be removed\n"
373 msgstr ""
374
375-#: cmdline/apt-get.cc:755
376+#: cmdline/apt-get.cc:759
377 #, c-format
378 msgid "Note, selecting '%s' instead of '%s'\n"
379 msgstr ""
380
381-#: cmdline/apt-get.cc:785
382+#: cmdline/apt-get.cc:789
383 #, c-format
384 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
385 msgstr ""
386
387-#: cmdline/apt-get.cc:789
388+#: cmdline/apt-get.cc:793
389 #, c-format
390 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
391 msgstr ""
392
393-#: cmdline/apt-get.cc:799
394+#: cmdline/apt-get.cc:803
395 #, c-format
396 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
397 msgstr ""
398
399-#: cmdline/apt-get.cc:804
400+#: cmdline/apt-get.cc:808
401 #, c-format
402 msgid "%s is already the newest version.\n"
403 msgstr ""
404
405-#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
406+#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2024
407 #, c-format
408 msgid "%s set to manually installed.\n"
409 msgstr ""
410
411-#: cmdline/apt-get.cc:863
412+#: cmdline/apt-get.cc:853
413+#, c-format
414+msgid "Selected version '%s' (%s) for '%s'\n"
415+msgstr ""
416+
417+#: cmdline/apt-get.cc:858
418+#, c-format
419+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
420+msgstr ""
421+
422+#: cmdline/apt-get.cc:899
423 #, c-format
424 msgid "Package %s is not installed, so not removed\n"
425 msgstr ""
426
427-#: cmdline/apt-get.cc:938
428+#: cmdline/apt-get.cc:977
429 msgid "Correcting dependencies..."
430 msgstr ""
431
432-#: cmdline/apt-get.cc:941
433+#: cmdline/apt-get.cc:980
434 msgid " failed."
435 msgstr ""
436
437-#: cmdline/apt-get.cc:944
438+#: cmdline/apt-get.cc:983
439 msgid "Unable to correct dependencies"
440 msgstr ""
441
442-#: cmdline/apt-get.cc:947
443+#: cmdline/apt-get.cc:986
444 msgid "Unable to minimize the upgrade set"
445 msgstr ""
446
447-#: cmdline/apt-get.cc:949
448+#: cmdline/apt-get.cc:988
449 msgid " Done"
450 msgstr ""
451
452-#: cmdline/apt-get.cc:953
453+#: cmdline/apt-get.cc:992
454 msgid "You might want to run 'apt-get -f install' to correct these."
455 msgstr ""
456
457-#: cmdline/apt-get.cc:956
458+#: cmdline/apt-get.cc:995
459 msgid "Unmet dependencies. Try using -f."
460 msgstr ""
461
462-#: cmdline/apt-get.cc:981
463+#: cmdline/apt-get.cc:1020
464 msgid "WARNING: The following packages cannot be authenticated!"
465 msgstr ""
466
467-#: cmdline/apt-get.cc:985
468+#: cmdline/apt-get.cc:1024
469 msgid "Authentication warning overridden.\n"
470 msgstr ""
471
472-#: cmdline/apt-get.cc:992
473+#: cmdline/apt-get.cc:1031
474 msgid "Install these packages without verification [y/N]? "
475 msgstr ""
476
477-#: cmdline/apt-get.cc:994
478+#: cmdline/apt-get.cc:1033
479 msgid "Some packages could not be authenticated"
480 msgstr ""
481
482-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
483+#: cmdline/apt-get.cc:1042 cmdline/apt-get.cc:1203
484 msgid "There are problems and -y was used without --force-yes"
485 msgstr ""
486
487-#: cmdline/apt-get.cc:1044
488+#: cmdline/apt-get.cc:1083
489 msgid "Internal error, InstallPackages was called with broken packages!"
490 msgstr ""
491
492-#: cmdline/apt-get.cc:1053
493+#: cmdline/apt-get.cc:1092
494 msgid "Packages need to be removed but remove is disabled."
495 msgstr ""
496
497-#: cmdline/apt-get.cc:1064
498+#: cmdline/apt-get.cc:1103
499 msgid "Internal error, Ordering didn't finish"
500 msgstr ""
501
502-#: cmdline/apt-get.cc:1104
503+#: cmdline/apt-get.cc:1141
504 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
505 msgstr ""
506
507 #. TRANSLATOR: The required space between number and unit is already included
508 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
509-#: cmdline/apt-get.cc:1111
510+#: cmdline/apt-get.cc:1148
511 #, c-format
512 msgid "Need to get %sB/%sB of archives.\n"
513 msgstr ""
514
515 #. TRANSLATOR: The required space between number and unit is already included
516 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
517-#: cmdline/apt-get.cc:1116
518+#: cmdline/apt-get.cc:1153
519 #, c-format
520 msgid "Need to get %sB of archives.\n"
521 msgstr ""
522
523 #. TRANSLATOR: The required space between number and unit is already included
524 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
525-#: cmdline/apt-get.cc:1123
526+#: cmdline/apt-get.cc:1160
527 #, c-format
528 msgid "After this operation, %sB of additional disk space will be used.\n"
529 msgstr ""
530
531 #. TRANSLATOR: The required space between number and unit is already included
532 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
533-#: cmdline/apt-get.cc:1128
534+#: cmdline/apt-get.cc:1165
535 #, c-format
536 msgid "After this operation, %sB disk space will be freed.\n"
537 msgstr ""
538
539-#: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332
540-#: cmdline/apt-get.cc:2335
541+#: cmdline/apt-get.cc:1180 cmdline/apt-get.cc:1183 cmdline/apt-get.cc:2428
542+#: cmdline/apt-get.cc:2431
543 #, c-format
544 msgid "Couldn't determine free space in %s"
545 msgstr ""
546
547-#: cmdline/apt-get.cc:1156
548+#: cmdline/apt-get.cc:1193
549 #, c-format
550 msgid "You don't have enough free space in %s."
551 msgstr ""
552
553-#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
554+#: cmdline/apt-get.cc:1209 cmdline/apt-get.cc:1229
555 msgid "Trivial Only specified but this is not a trivial operation."
556 msgstr ""
557
558-#: cmdline/apt-get.cc:1174
559+#: cmdline/apt-get.cc:1211
560 msgid "Yes, do as I say!"
561 msgstr ""
562
563-#: cmdline/apt-get.cc:1176
564+#: cmdline/apt-get.cc:1213
565 #, c-format
566 msgid ""
567 "You are about to do something potentially harmful.\n"
568@@ -860,46 +862,46 @@
569 " ?] "
570 msgstr ""
571
572-#: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201
573+#: cmdline/apt-get.cc:1219 cmdline/apt-get.cc:1238
574 msgid "Abort."
575 msgstr ""
576
577-#: cmdline/apt-get.cc:1197
578+#: cmdline/apt-get.cc:1234
579 msgid "Do you want to continue [Y/n]? "
580 msgstr ""
581
582-#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
583+#: cmdline/apt-get.cc:1306 cmdline/apt-get.cc:2488 apt-pkg/algorithms.cc:1580
584 #, c-format
585 msgid "Failed to fetch %s %s\n"
586 msgstr ""
587
588-#: cmdline/apt-get.cc:1287
589+#: cmdline/apt-get.cc:1324
590 msgid "Some files failed to download"
591 msgstr ""
592
593-#: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
594+#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:2497
595 msgid "Download complete and in download only mode"
596 msgstr ""
597
598-#: cmdline/apt-get.cc:1294
599+#: cmdline/apt-get.cc:1331
600 msgid ""
601 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
602 "missing?"
603 msgstr ""
604
605-#: cmdline/apt-get.cc:1298
606+#: cmdline/apt-get.cc:1335
607 msgid "--fix-missing and media swapping is not currently supported"
608 msgstr ""
609
610-#: cmdline/apt-get.cc:1303
611+#: cmdline/apt-get.cc:1340
612 msgid "Unable to correct missing packages."
613 msgstr ""
614
615-#: cmdline/apt-get.cc:1304
616+#: cmdline/apt-get.cc:1341
617 msgid "Aborting install."
618 msgstr ""
619
620-#: cmdline/apt-get.cc:1332
621+#: cmdline/apt-get.cc:1369
622 msgid ""
623 "The following package disappeared from your system as\n"
624 "all files have been overwritten by other packages:"
625@@ -909,56 +911,35 @@
626 msgstr[0] ""
627 msgstr[1] ""
628
629-#: cmdline/apt-get.cc:1336
630+#: cmdline/apt-get.cc:1373
631 msgid "Note: This is done automatic and on purpose by dpkg."
632 msgstr ""
633
634-#: cmdline/apt-get.cc:1466
635+#: cmdline/apt-get.cc:1503
636 #, c-format
637 msgid "Ignore unavailable target release '%s' of package '%s'"
638 msgstr ""
639
640-#: cmdline/apt-get.cc:1498
641+#: cmdline/apt-get.cc:1535
642 #, c-format
643 msgid "Picking '%s' as source package instead of '%s'\n"
644 msgstr ""
645
646 #. if (VerTag.empty() == false && Last == 0)
647-#: cmdline/apt-get.cc:1536
648+#: cmdline/apt-get.cc:1573
649 #, c-format
650 msgid "Ignore unavailable version '%s' of package '%s'"
651 msgstr ""
652
653-#: cmdline/apt-get.cc:1552
654+#: cmdline/apt-get.cc:1589
655 msgid "The update command takes no arguments"
656 msgstr ""
657
658-#: cmdline/apt-get.cc:1618
659+#: cmdline/apt-get.cc:1651
660 msgid "We are not supposed to delete stuff, can't start AutoRemover"
661 msgstr ""
662
663-#: cmdline/apt-get.cc:1666
664-msgid ""
665-"The following package was automatically installed and is no longer required:"
666-msgid_plural ""
667-"The following packages were automatically installed and are no longer "
668-"required:"
669-msgstr[0] ""
670-msgstr[1] ""
671-
672-#: cmdline/apt-get.cc:1670
673-#, c-format
674-msgid "%lu package was automatically installed and is no longer required.\n"
675-msgid_plural ""
676-"%lu packages were automatically installed and are no longer required.\n"
677-msgstr[0] ""
678-msgstr[1] ""
679-
680-#: cmdline/apt-get.cc:1672
681-msgid "Use 'apt-get autoremove' to remove them."
682-msgstr ""
683-
684-#: cmdline/apt-get.cc:1677
685+#: cmdline/apt-get.cc:1703
686 msgid ""
687 "Hmm, seems like the AutoRemover destroyed something which really\n"
688 "shouldn't happen. Please file a bug report against apt."
689@@ -974,29 +955,50 @@
690 #. "that package should be filed.") << endl;
691 #. }
692 #.
693-#: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822
694+#: cmdline/apt-get.cc:1706 cmdline/apt-get.cc:1855
695 msgid "The following information may help to resolve the situation:"
696 msgstr ""
697
698-#: cmdline/apt-get.cc:1684
699+#: cmdline/apt-get.cc:1710
700 msgid "Internal Error, AutoRemover broke stuff"
701 msgstr ""
702
703-#: cmdline/apt-get.cc:1703
704+#: cmdline/apt-get.cc:1717
705+msgid ""
706+"The following package was automatically installed and is no longer required:"
707+msgid_plural ""
708+"The following packages were automatically installed and are no longer "
709+"required:"
710+msgstr[0] ""
711+msgstr[1] ""
712+
713+#: cmdline/apt-get.cc:1721
714+#, c-format
715+msgid "%lu package was automatically installed and is no longer required.\n"
716+msgid_plural ""
717+"%lu packages were automatically installed and are no longer required.\n"
718+msgstr[0] ""
719+msgstr[1] ""
720+
721+#: cmdline/apt-get.cc:1723
722+msgid "Use 'apt-get autoremove' to remove them."
723+msgstr ""
724+
725+#: cmdline/apt-get.cc:1742
726 msgid "Internal error, AllUpgrade broke stuff"
727 msgstr ""
728
729-#: cmdline/apt-get.cc:1792
730+#: cmdline/apt-get.cc:1825
731 msgid "You might want to run 'apt-get -f install' to correct these:"
732 msgstr ""
733
734-#: cmdline/apt-get.cc:1795
735+#: cmdline/apt-get.cc:1828
736 msgid ""
737 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
738 "solution)."
739 msgstr ""
740
741-#: cmdline/apt-get.cc:1807
742+#: cmdline/apt-get.cc:1840
743 msgid ""
744 "Some packages could not be installed. This may mean that you have\n"
745 "requested an impossible situation or if you are using the unstable\n"
746@@ -1004,69 +1006,74 @@
747 "or been moved out of Incoming."
748 msgstr ""
749
750-#: cmdline/apt-get.cc:1825
751+#: cmdline/apt-get.cc:1858
752 msgid "Broken packages"
753 msgstr ""
754
755-#: cmdline/apt-get.cc:1854
756+#: cmdline/apt-get.cc:1886
757 msgid "The following extra packages will be installed:"
758 msgstr ""
759
760-#: cmdline/apt-get.cc:1944
761+#: cmdline/apt-get.cc:1976
762 msgid "Suggested packages:"
763 msgstr ""
764
765-#: cmdline/apt-get.cc:1945
766+#: cmdline/apt-get.cc:1977
767 msgid "Recommended packages:"
768 msgstr ""
769
770-#: cmdline/apt-get.cc:1987
771+#: cmdline/apt-get.cc:2019
772 #, c-format
773 msgid "Couldn't find package %s"
774 msgstr ""
775
776-#: cmdline/apt-get.cc:1994
777+#: cmdline/apt-get.cc:2026
778 #, c-format
779 msgid "%s set to automatically installed.\n"
780 msgstr ""
781
782-#: cmdline/apt-get.cc:2015
783+#: cmdline/apt-get.cc:2047
784 msgid "Calculating upgrade... "
785 msgstr ""
786
787-#: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
788+#: cmdline/apt-get.cc:2050 methods/ftp.cc:707 methods/connect.cc:111
789 msgid "Failed"
790 msgstr ""
791
792-#: cmdline/apt-get.cc:2023
793+#: cmdline/apt-get.cc:2055
794 msgid "Done"
795 msgstr ""
796
797-#: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
798+#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2130
799 msgid "Internal error, problem resolver broke stuff"
800 msgstr ""
801
802-#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
803+#: cmdline/apt-get.cc:2154 cmdline/apt-get.cc:2187
804 msgid "Unable to lock the download directory"
805 msgstr ""
806
807-#: cmdline/apt-get.cc:2198
808+#: cmdline/apt-get.cc:2238
809+#, c-format
810+msgid "Downloading %s %s"
811+msgstr ""
812+
813+#: cmdline/apt-get.cc:2294
814 msgid "Must specify at least one package to fetch source for"
815 msgstr ""
816
817-#: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
818+#: cmdline/apt-get.cc:2334 cmdline/apt-get.cc:2615
819 #, c-format
820 msgid "Unable to find a source package for %s"
821 msgstr ""
822
823-#: cmdline/apt-get.cc:2254
824+#: cmdline/apt-get.cc:2350
825 #, c-format
826 msgid ""
827 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
828 "%s\n"
829 msgstr ""
830
831-#: cmdline/apt-get.cc:2259
832+#: cmdline/apt-get.cc:2355
833 #, c-format
834 msgid ""
835 "Please use:\n"
836@@ -1074,115 +1081,120 @@
837 "to retrieve the latest (possibly unreleased) updates to the package.\n"
838 msgstr ""
839
840-#: cmdline/apt-get.cc:2310
841+#: cmdline/apt-get.cc:2406
842 #, c-format
843 msgid "Skipping already downloaded file '%s'\n"
844 msgstr ""
845
846-#: cmdline/apt-get.cc:2345
847+#: cmdline/apt-get.cc:2441
848 #, c-format
849 msgid "You don't have enough free space in %s"
850 msgstr ""
851
852 #. TRANSLATOR: The required space between number and unit is already included
853 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
854-#: cmdline/apt-get.cc:2353
855+#: cmdline/apt-get.cc:2449
856 #, c-format
857 msgid "Need to get %sB/%sB of source archives.\n"
858 msgstr ""
859
860 #. TRANSLATOR: The required space between number and unit is already included
861 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
862-#: cmdline/apt-get.cc:2358
863+#: cmdline/apt-get.cc:2454
864 #, c-format
865 msgid "Need to get %sB of source archives.\n"
866 msgstr ""
867
868-#: cmdline/apt-get.cc:2364
869+#: cmdline/apt-get.cc:2460
870 #, c-format
871 msgid "Fetch source %s\n"
872 msgstr ""
873
874-#: cmdline/apt-get.cc:2397
875+#: cmdline/apt-get.cc:2493
876 msgid "Failed to fetch some archives."
877 msgstr ""
878
879-#: cmdline/apt-get.cc:2427
880+#: cmdline/apt-get.cc:2523
881 #, c-format
882 msgid "Skipping unpack of already unpacked source in %s\n"
883 msgstr ""
884
885-#: cmdline/apt-get.cc:2439
886+#: cmdline/apt-get.cc:2535
887 #, c-format
888 msgid "Unpack command '%s' failed.\n"
889 msgstr ""
890
891-#: cmdline/apt-get.cc:2440
892+#: cmdline/apt-get.cc:2536
893 #, c-format
894 msgid "Check if the 'dpkg-dev' package is installed.\n"
895 msgstr ""
896
897-#: cmdline/apt-get.cc:2457
898+#: cmdline/apt-get.cc:2553
899 #, c-format
900 msgid "Build command '%s' failed.\n"
901 msgstr ""
902
903-#: cmdline/apt-get.cc:2477
904+#: cmdline/apt-get.cc:2573
905 msgid "Child process failed"
906 msgstr ""
907
908-#: cmdline/apt-get.cc:2493
909+#: cmdline/apt-get.cc:2589
910 msgid "Must specify at least one package to check builddeps for"
911 msgstr ""
912
913-#: cmdline/apt-get.cc:2524
914+#: cmdline/apt-get.cc:2620
915 #, c-format
916 msgid "Unable to get build-dependency information for %s"
917 msgstr ""
918
919-#: cmdline/apt-get.cc:2544
920+#: cmdline/apt-get.cc:2640
921 #, c-format
922 msgid "%s has no build depends.\n"
923 msgstr ""
924
925-#: cmdline/apt-get.cc:2595
926+#: cmdline/apt-get.cc:2691
927 #, c-format
928 msgid ""
929 "%s dependency for %s cannot be satisfied because the package %s cannot be "
930 "found"
931 msgstr ""
932
933-#: cmdline/apt-get.cc:2648
934+#: cmdline/apt-get.cc:2744
935 #, c-format
936 msgid ""
937 "%s dependency for %s cannot be satisfied because no available versions of "
938 "package %s can satisfy version requirements"
939 msgstr ""
940
941-#: cmdline/apt-get.cc:2684
942+#: cmdline/apt-get.cc:2780
943 #, c-format
944 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
945 msgstr ""
946
947-#: cmdline/apt-get.cc:2711
948+#: cmdline/apt-get.cc:2807
949 #, c-format
950 msgid "Failed to satisfy %s dependency for %s: %s"
951 msgstr ""
952
953-#: cmdline/apt-get.cc:2727
954+#: cmdline/apt-get.cc:2823
955 #, c-format
956 msgid "Build-dependencies for %s could not be satisfied."
957 msgstr ""
958
959-#: cmdline/apt-get.cc:2732
960+#: cmdline/apt-get.cc:2828
961 msgid "Failed to process build dependencies"
962 msgstr ""
963
964-#: cmdline/apt-get.cc:2763
965+#: cmdline/apt-get.cc:2921 cmdline/apt-get.cc:2933
966+#, c-format
967+msgid "Changelog for %s (%s)"
968+msgstr ""
969+
970+#: cmdline/apt-get.cc:3055
971 msgid "Supported modules:"
972 msgstr ""
973
974-#: cmdline/apt-get.cc:2804
975+#: cmdline/apt-get.cc:3096
976 msgid ""
977 "Usage: apt-get [options] command\n"
978 " apt-get [options] install|remove pkg1 [pkg2 ...]\n"
979@@ -1208,6 +1220,8 @@
980 " check - Verify that there are no broken dependencies\n"
981 " markauto - Mark the given packages as automatically installed\n"
982 " unmarkauto - Mark the given packages as manually installed\n"
983+" changelog - Download and display the changelog for the given package\n"
984+" download - Download the binary package into the current directory\n"
985 "\n"
986 "Options:\n"
987 " -h This help text.\n"
988@@ -1228,7 +1242,7 @@
989 " This APT has Super Cow Powers.\n"
990 msgstr ""
991
992-#: cmdline/apt-get.cc:2960
993+#: cmdline/apt-get.cc:3257
994 msgid ""
995 "NOTE: This is only a simulation!\n"
996 " apt-get needs root privileges for real execution.\n"
997@@ -1236,33 +1250,33 @@
998 " so don't depend on the relevance to the real current situation!"
999 msgstr ""
1000
1001-#: cmdline/acqprogress.cc:55
1002+#: cmdline/acqprogress.cc:57
1003 msgid "Hit "
1004 msgstr ""
1005
1006-#: cmdline/acqprogress.cc:79
1007+#: cmdline/acqprogress.cc:81
1008 msgid "Get:"
1009 msgstr ""
1010
1011-#: cmdline/acqprogress.cc:110
1012+#: cmdline/acqprogress.cc:112
1013 msgid "Ign "
1014 msgstr ""
1015
1016-#: cmdline/acqprogress.cc:114
1017+#: cmdline/acqprogress.cc:116
1018 msgid "Err "
1019 msgstr ""
1020
1021-#: cmdline/acqprogress.cc:135
1022+#: cmdline/acqprogress.cc:137
1023 #, c-format
1024 msgid "Fetched %sB in %s (%sB/s)\n"
1025 msgstr ""
1026
1027-#: cmdline/acqprogress.cc:225
1028+#: cmdline/acqprogress.cc:227
1029 #, c-format
1030 msgid " [Working]"
1031 msgstr ""
1032
1033-#: cmdline/acqprogress.cc:271
1034+#: cmdline/acqprogress.cc:283
1035 #, c-format
1036 msgid ""
1037 "Media change: please insert the disc labeled\n"
1038@@ -1330,7 +1344,7 @@
1039 msgid "Failed to exec gzip "
1040 msgstr ""
1041
1042-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
1043+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
1044 msgid "Corrupted archive"
1045 msgstr ""
1046
1047@@ -1338,7 +1352,7 @@
1048 msgid "Tar checksum failed, archive corrupted"
1049 msgstr ""
1050
1051-#: apt-inst/contrib/extracttar.cc:296
1052+#: apt-inst/contrib/extracttar.cc:300
1053 #, c-format
1054 msgid "Unknown TAR header type %u, member %s"
1055 msgstr ""
1056@@ -1446,28 +1460,28 @@
1057 msgid "The path is too long"
1058 msgstr ""
1059
1060-#: apt-inst/extract.cc:414
1061+#: apt-inst/extract.cc:412
1062 #, c-format
1063 msgid "Overwrite package match with no version for %s"
1064 msgstr ""
1065
1066-#: apt-inst/extract.cc:431
1067+#: apt-inst/extract.cc:429
1068 #, c-format
1069 msgid "File %s/%s overwrites the one in the package %s"
1070 msgstr ""
1071
1072 #. Only warn if there are no sources.list.d.
1073 #. Only warn if there is no sources.list file.
1074-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
1075-#: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204
1076-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
1077-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
1078+#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
1079+#: apt-pkg/contrib/fileutl.cc:333 apt-pkg/sourcelist.cc:204
1080+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:106
1081+#: apt-pkg/init.cc:114 apt-pkg/clean.cc:33 apt-pkg/policy.cc:309
1082 #: methods/mirror.cc:87
1083 #, c-format
1084 msgid "Unable to read %s"
1085 msgstr ""
1086
1087-#: apt-inst/extract.cc:491
1088+#: apt-inst/extract.cc:489
1089 #, c-format
1090 msgid "Unable to stat %s"
1091 msgstr ""
1092@@ -1491,9 +1505,9 @@
1093 msgid "The info and temp directories need to be on the same filesystem"
1094 msgstr ""
1095
1096-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
1097-#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
1098-#: apt-pkg/pkgcachegen.cc:1326
1099+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1074
1100+#: apt-pkg/pkgcachegen.cc:1178 apt-pkg/pkgcachegen.cc:1184
1101+#: apt-pkg/pkgcachegen.cc:1330
1102 msgid "Reading package lists"
1103 msgstr ""
1104
1105@@ -1593,24 +1607,28 @@
1106 msgid "Unparsable control file"
1107 msgstr ""
1108
1109-#: methods/bzip2.cc:65
1110+#: methods/bzip2.cc:60 methods/gzip.cc:52
1111+msgid "Empty files can't be valid archives"
1112+msgstr ""
1113+
1114+#: methods/bzip2.cc:64
1115 #, c-format
1116 msgid "Couldn't open pipe for %s"
1117 msgstr ""
1118
1119-#: methods/bzip2.cc:109
1120+#: methods/bzip2.cc:108
1121 #, c-format
1122 msgid "Read error from %s process"
1123 msgstr ""
1124
1125-#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
1126-#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
1127-#: methods/rred.cc:495
1128+#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
1129+#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
1130+#: methods/rred.cc:533
1131 msgid "Failed to stat"
1132 msgstr ""
1133
1134-#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
1135-#: methods/rred.cc:492
1136+#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
1137+#: methods/rred.cc:530
1138 msgid "Failed to set modification time"
1139 msgstr ""
1140
1141@@ -1698,7 +1716,7 @@
1142 msgid "Server closed the connection"
1143 msgstr ""
1144
1145-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190
1146+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:810 methods/rsh.cc:190
1147 msgid "Read error"
1148 msgstr ""
1149
1150@@ -1710,7 +1728,7 @@
1151 msgid "Protocol corruption"
1152 msgstr ""
1153
1154-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
1155+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:852 methods/rsh.cc:232
1156 msgid "Write error"
1157 msgstr ""
1158
1159@@ -1942,7 +1960,7 @@
1160 msgid "Error reading from server"
1161 msgstr ""
1162
1163-#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
1164+#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283
1165 msgid "Failed to truncate file"
1166 msgstr ""
1167
1168@@ -1980,21 +1998,21 @@
1169 msgid "Unable to synchronize mmap"
1170 msgstr ""
1171
1172-#: apt-pkg/contrib/mmap.cc:300
1173+#: apt-pkg/contrib/mmap.cc:302
1174 #, c-format
1175 msgid ""
1176 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
1177 "Current value: %lu. (man 5 apt.conf)"
1178 msgstr ""
1179
1180-#: apt-pkg/contrib/mmap.cc:399
1181+#: apt-pkg/contrib/mmap.cc:401
1182 #, c-format
1183 msgid ""
1184 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
1185 "reached."
1186 msgstr ""
1187
1188-#: apt-pkg/contrib/mmap.cc:402
1189+#: apt-pkg/contrib/mmap.cc:404
1190 msgid ""
1191 "Unable to increase size of the MMap as automatic growing is disabled by user."
1192 msgstr ""
1193@@ -2023,7 +2041,7 @@
1194 msgid "%lis"
1195 msgstr ""
1196
1197-#: apt-pkg/contrib/strutl.cc:1119
1198+#: apt-pkg/contrib/strutl.cc:1136
1199 #, c-format
1200 msgid "Selection %s not found"
1201 msgstr ""
1202@@ -2155,92 +2173,113 @@
1203 msgid "Failed to stat the cdrom"
1204 msgstr ""
1205
1206-#: apt-pkg/contrib/fileutl.cc:154
1207+#: apt-pkg/contrib/fileutl.cc:158
1208 #, c-format
1209 msgid "Not using locking for read only lock file %s"
1210 msgstr ""
1211
1212-#: apt-pkg/contrib/fileutl.cc:159
1213+#: apt-pkg/contrib/fileutl.cc:163
1214 #, c-format
1215 msgid "Could not open lock file %s"
1216 msgstr ""
1217
1218-#: apt-pkg/contrib/fileutl.cc:177
1219+#: apt-pkg/contrib/fileutl.cc:181
1220 #, c-format
1221 msgid "Not using locking for nfs mounted lock file %s"
1222 msgstr ""
1223
1224-#: apt-pkg/contrib/fileutl.cc:181
1225+#: apt-pkg/contrib/fileutl.cc:185
1226 #, c-format
1227 msgid "Could not get lock %s"
1228 msgstr ""
1229
1230-#: apt-pkg/contrib/fileutl.cc:643
1231+#: apt-pkg/contrib/fileutl.cc:325
1232+#, c-format
1233+msgid "List of files can't be created as '%s' is not a directory"
1234+msgstr ""
1235+
1236+#: apt-pkg/contrib/fileutl.cc:352
1237+#, c-format
1238+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
1239+msgstr ""
1240+
1241+#: apt-pkg/contrib/fileutl.cc:370
1242+#, c-format
1243+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
1244+msgstr ""
1245+
1246+#: apt-pkg/contrib/fileutl.cc:379
1247+#, c-format
1248+msgid ""
1249+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
1250+msgstr ""
1251+
1252+#: apt-pkg/contrib/fileutl.cc:669
1253 #, c-format
1254 msgid "Waited for %s but it wasn't there"
1255 msgstr ""
1256
1257-#: apt-pkg/contrib/fileutl.cc:655
1258+#: apt-pkg/contrib/fileutl.cc:681
1259 #, c-format
1260 msgid "Sub-process %s received a segmentation fault."
1261 msgstr ""
1262
1263-#: apt-pkg/contrib/fileutl.cc:657
1264+#: apt-pkg/contrib/fileutl.cc:683
1265 #, c-format
1266 msgid "Sub-process %s received signal %u."
1267 msgstr ""
1268
1269-#: apt-pkg/contrib/fileutl.cc:661
1270+#: apt-pkg/contrib/fileutl.cc:687
1271 #, c-format
1272 msgid "Sub-process %s returned an error code (%u)"
1273 msgstr ""
1274
1275-#: apt-pkg/contrib/fileutl.cc:663
1276+#: apt-pkg/contrib/fileutl.cc:689
1277 #, c-format
1278 msgid "Sub-process %s exited unexpectedly"
1279 msgstr ""
1280
1281-#: apt-pkg/contrib/fileutl.cc:728
1282+#: apt-pkg/contrib/fileutl.cc:754
1283 #, c-format
1284 msgid "Could not open file %s"
1285 msgstr ""
1286
1287-#: apt-pkg/contrib/fileutl.cc:745
1288+#: apt-pkg/contrib/fileutl.cc:771
1289 #, c-format
1290 msgid "Could not open file descriptor %d"
1291 msgstr ""
1292
1293-#: apt-pkg/contrib/fileutl.cc:805
1294+#: apt-pkg/contrib/fileutl.cc:831
1295 #, c-format
1296 msgid "read, still have %lu to read but none left"
1297 msgstr ""
1298
1299-#: apt-pkg/contrib/fileutl.cc:838
1300+#: apt-pkg/contrib/fileutl.cc:864
1301 #, c-format
1302 msgid "write, still have %lu to write but couldn't"
1303 msgstr ""
1304
1305-#: apt-pkg/contrib/fileutl.cc:967
1306+#: apt-pkg/contrib/fileutl.cc:1000
1307 #, c-format
1308 msgid "Problem closing the gzip file %s"
1309 msgstr ""
1310
1311-#: apt-pkg/contrib/fileutl.cc:970
1312+#: apt-pkg/contrib/fileutl.cc:1003
1313 #, c-format
1314 msgid "Problem closing the file %s"
1315 msgstr ""
1316
1317-#: apt-pkg/contrib/fileutl.cc:975
1318+#: apt-pkg/contrib/fileutl.cc:1008
1319 #, c-format
1320 msgid "Problem renaming the file %s to %s"
1321 msgstr ""
1322
1323-#: apt-pkg/contrib/fileutl.cc:986
1324+#: apt-pkg/contrib/fileutl.cc:1019
1325 #, c-format
1326 msgid "Problem unlinking the file %s"
1327 msgstr ""
1328
1329-#: apt-pkg/contrib/fileutl.cc:999
1330+#: apt-pkg/contrib/fileutl.cc:1032
1331 msgid "Problem syncing the file"
1332 msgstr ""
1333
1334@@ -2321,33 +2360,33 @@
1335 msgid "extra"
1336 msgstr ""
1337
1338-#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
1339+#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
1340 msgid "Building dependency tree"
1341 msgstr ""
1342
1343-#: apt-pkg/depcache.cc:125
1344+#: apt-pkg/depcache.cc:126
1345 msgid "Candidate versions"
1346 msgstr ""
1347
1348-#: apt-pkg/depcache.cc:154
1349+#: apt-pkg/depcache.cc:155
1350 msgid "Dependency generation"
1351 msgstr ""
1352
1353-#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
1354+#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
1355 msgid "Reading state information"
1356 msgstr ""
1357
1358-#: apt-pkg/depcache.cc:236
1359+#: apt-pkg/depcache.cc:237
1360 #, c-format
1361 msgid "Failed to open StateFile %s"
1362 msgstr ""
1363
1364-#: apt-pkg/depcache.cc:242
1365+#: apt-pkg/depcache.cc:243
1366 #, c-format
1367 msgid "Failed to write temporary StateFile %s"
1368 msgstr ""
1369
1370-#: apt-pkg/depcache.cc:921
1371+#: apt-pkg/depcache.cc:922
1372 #, c-format
1373 msgid "Internal error, group '%s' has no installable pseudo package"
1374 msgstr ""
1375@@ -2459,25 +2498,25 @@
1376 msgid "Index file type '%s' is not supported"
1377 msgstr ""
1378
1379-#: apt-pkg/algorithms.cc:292
1380+#: apt-pkg/algorithms.cc:313
1381 #, c-format
1382 msgid ""
1383 "The package %s needs to be reinstalled, but I can't find an archive for it."
1384 msgstr ""
1385
1386-#: apt-pkg/algorithms.cc:1210
1387+#: apt-pkg/algorithms.cc:1328
1388 msgid ""
1389 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
1390 "held packages."
1391 msgstr ""
1392
1393-#: apt-pkg/algorithms.cc:1212
1394+#: apt-pkg/algorithms.cc:1330
1395 msgid "Unable to correct problems, you have held broken packages."
1396 msgstr ""
1397
1398-#: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
1399+#: apt-pkg/algorithms.cc:1606 apt-pkg/algorithms.cc:1608
1400 msgid ""
1401-"Some index files failed to download, they have been ignored, or old ones "
1402+"Some index files failed to download. They have been ignored, or old ones "
1403 "used instead."
1404 msgstr ""
1405
1406@@ -2523,12 +2562,12 @@
1407 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
1408 msgstr ""
1409
1410-#: apt-pkg/init.cc:146
1411+#: apt-pkg/init.cc:149
1412 #, c-format
1413 msgid "Packaging system '%s' is not supported"
1414 msgstr ""
1415
1416-#: apt-pkg/init.cc:162
1417+#: apt-pkg/init.cc:165
1418 msgid "Unable to determine a suitable packaging system type"
1419 msgstr ""
1420
1421@@ -2553,17 +2592,17 @@
1422 msgid "The list of sources could not be read."
1423 msgstr ""
1424
1425-#: apt-pkg/policy.cc:344
1426+#: apt-pkg/policy.cc:346
1427 #, c-format
1428 msgid "Invalid record in the preferences file %s, no Package header"
1429 msgstr ""
1430
1431-#: apt-pkg/policy.cc:366
1432+#: apt-pkg/policy.cc:368
1433 #, c-format
1434 msgid "Did not understand pin type %s"
1435 msgstr ""
1436
1437-#: apt-pkg/policy.cc:374
1438+#: apt-pkg/policy.cc:376
1439 msgid "No priority (or zero) specified for pin"
1440 msgstr ""
1441
1442@@ -2643,16 +2682,16 @@
1443 msgid "Package %s %s was not found while processing file dependencies"
1444 msgstr ""
1445
1446-#: apt-pkg/pkgcachegen.cc:982
1447+#: apt-pkg/pkgcachegen.cc:986
1448 #, c-format
1449 msgid "Couldn't stat source package list %s"
1450 msgstr ""
1451
1452-#: apt-pkg/pkgcachegen.cc:1087
1453+#: apt-pkg/pkgcachegen.cc:1091
1454 msgid "Collecting File Provides"
1455 msgstr ""
1456
1457-#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
1458+#: apt-pkg/pkgcachegen.cc:1269 apt-pkg/pkgcachegen.cc:1276
1459 msgid "IO Error saving source cache"
1460 msgstr ""
1461
1462@@ -2661,65 +2700,77 @@
1463 msgid "rename failed, %s (%s -> %s)."
1464 msgstr ""
1465
1466-#: apt-pkg/acquire-item.cc:484
1467+#: apt-pkg/acquire-item.cc:629
1468 msgid "MD5Sum mismatch"
1469 msgstr ""
1470
1471-#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
1472-#: apt-pkg/acquire-item.cc:1717
1473+#: apt-pkg/acquire-item.cc:887 apt-pkg/acquire-item.cc:1781
1474+#: apt-pkg/acquire-item.cc:1924
1475 msgid "Hash Sum mismatch"
1476 msgstr ""
1477
1478-#: apt-pkg/acquire-item.cc:1244
1479+#: apt-pkg/acquire-item.cc:1341
1480+#, c-format
1481+msgid ""
1482+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
1483+"or malformed file)"
1484+msgstr ""
1485+
1486+#: apt-pkg/acquire-item.cc:1356
1487+#, c-format
1488+msgid "Unable to find hash sum for '%s' in Release file"
1489+msgstr ""
1490+
1491+#: apt-pkg/acquire-item.cc:1415
1492 msgid "There is no public key available for the following key IDs:\n"
1493 msgstr ""
1494
1495 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
1496 #. the time since then the file is invalid - formated in the same way as in
1497 #. the download progress display (e.g. 7d 3h 42min 1s)
1498-#: apt-pkg/acquire-item.cc:1281
1499+#: apt-pkg/acquire-item.cc:1452
1500 #, c-format
1501 msgid "Release file expired, ignoring %s (invalid since %s)"
1502 msgstr ""
1503
1504-#: apt-pkg/acquire-item.cc:1302
1505+#: apt-pkg/acquire-item.cc:1473
1506 #, c-format
1507 msgid "Conflicting distribution: %s (expected %s but got %s)"
1508 msgstr ""
1509
1510-#: apt-pkg/acquire-item.cc:1328
1511+#: apt-pkg/acquire-item.cc:1506
1512 #, c-format
1513 msgid ""
1514 "A error occurred during the signature verification. The repository is not "
1515 "updated and the previous index files will be used. GPG error: %s: %s\n"
1516 msgstr ""
1517
1518-#: apt-pkg/acquire-item.cc:1337
1519+#: apt-pkg/acquire-item.cc:1515
1520 #, c-format
1521 msgid "GPG error: %s: %s"
1522 msgstr ""
1523
1524-#: apt-pkg/acquire-item.cc:1365
1525+#: apt-pkg/acquire-item.cc:1572
1526 #, c-format
1527 msgid ""
1528 "I wasn't able to locate a file for the %s package. This might mean you need "
1529 "to manually fix this package. (due to missing arch)"
1530 msgstr ""
1531
1532-#: apt-pkg/acquire-item.cc:1424
1533+#: apt-pkg/acquire-item.cc:1631
1534 #, c-format
1535 msgid ""
1536 "I wasn't able to locate file for the %s package. This might mean you need to "
1537 "manually fix this package."
1538 msgstr ""
1539
1540-#: apt-pkg/acquire-item.cc:1479
1541+#: apt-pkg/acquire-item.cc:1686
1542 #, c-format
1543 msgid ""
1544 "The package index files are corrupted. No Filename: field for package %s."
1545 msgstr ""
1546
1547-#: apt-pkg/acquire-item.cc:1566
1548+#: apt-pkg/acquire-item.cc:1773
1549 msgid "Size mismatch"
1550 msgstr ""
1551
1552@@ -2728,22 +2779,22 @@
1553 msgid "Unable to parse Release file %s"
1554 msgstr ""
1555
1556-#: apt-pkg/indexrecords.cc:60
1557+#: apt-pkg/indexrecords.cc:63
1558 #, c-format
1559 msgid "No sections in Release file %s"
1560 msgstr ""
1561
1562-#: apt-pkg/indexrecords.cc:94
1563+#: apt-pkg/indexrecords.cc:97
1564 #, c-format
1565 msgid "No Hash entry in Release file %s"
1566 msgstr ""
1567
1568-#: apt-pkg/indexrecords.cc:107
1569+#: apt-pkg/indexrecords.cc:110
1570 #, c-format
1571 msgid "Invalid 'Valid-Until' entry in Release file %s"
1572 msgstr ""
1573
1574-#: apt-pkg/indexrecords.cc:122
1575+#: apt-pkg/indexrecords.cc:125
1576 #, c-format
1577 msgid "Invalid 'Date' entry in Release file %s"
1578 msgstr ""
1579@@ -2798,8 +2849,8 @@
1580 #: apt-pkg/cdrom.cc:666
1581 #, c-format
1582 msgid ""
1583-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
1584-"%zu signatures\n"
1585+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
1586+"zu signatures\n"
1587 msgstr ""
1588
1589 #: apt-pkg/cdrom.cc:677
1590@@ -2836,22 +2887,22 @@
1591 msgid "Source list entries for this disc are:\n"
1592 msgstr ""
1593
1594-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
1595+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909
1596 #, c-format
1597 msgid "Wrote %i records.\n"
1598 msgstr ""
1599
1600-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
1601+#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911
1602 #, c-format
1603 msgid "Wrote %i records with %i missing files.\n"
1604 msgstr ""
1605
1606-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
1607+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914
1608 #, c-format
1609 msgid "Wrote %i records with %i mismatched files\n"
1610 msgstr ""
1611
1612-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
1613+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917
1614 #, c-format
1615 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
1616 msgstr ""
1617@@ -2923,12 +2974,12 @@
1618 msgid "Installing %s"
1619 msgstr ""
1620
1621-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
1622+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
1623 #, c-format
1624 msgid "Configuring %s"
1625 msgstr ""
1626
1627-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830
1628+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
1629 #, c-format
1630 msgid "Removing %s"
1631 msgstr ""
1632@@ -2949,92 +3000,99 @@
1633 msgstr ""
1634
1635 #. FIXME: use a better string after freeze
1636-#: apt-pkg/deb/dpkgpm.cc:646
1637+#: apt-pkg/deb/dpkgpm.cc:642
1638 #, c-format
1639 msgid "Directory '%s' missing"
1640 msgstr ""
1641
1642-#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675
1643+#: apt-pkg/deb/dpkgpm.cc:657 apt-pkg/deb/dpkgpm.cc:671
1644 #, c-format
1645 msgid "Could not open file '%s'"
1646 msgstr ""
1647
1648-#: apt-pkg/deb/dpkgpm.cc:816
1649+#: apt-pkg/deb/dpkgpm.cc:812
1650 #, c-format
1651 msgid "Preparing %s"
1652 msgstr ""
1653
1654-#: apt-pkg/deb/dpkgpm.cc:817
1655+#: apt-pkg/deb/dpkgpm.cc:813
1656 #, c-format
1657 msgid "Unpacking %s"
1658 msgstr ""
1659
1660-#: apt-pkg/deb/dpkgpm.cc:822
1661+#: apt-pkg/deb/dpkgpm.cc:818
1662 #, c-format
1663 msgid "Preparing to configure %s"
1664 msgstr ""
1665
1666-#: apt-pkg/deb/dpkgpm.cc:824
1667+#: apt-pkg/deb/dpkgpm.cc:820
1668 #, c-format
1669 msgid "Installed %s"
1670 msgstr ""
1671
1672-#: apt-pkg/deb/dpkgpm.cc:829
1673+#: apt-pkg/deb/dpkgpm.cc:825
1674 #, c-format
1675 msgid "Preparing for removal of %s"
1676 msgstr ""
1677
1678-#: apt-pkg/deb/dpkgpm.cc:831
1679+#: apt-pkg/deb/dpkgpm.cc:827
1680 #, c-format
1681 msgid "Removed %s"
1682 msgstr ""
1683
1684-#: apt-pkg/deb/dpkgpm.cc:836
1685+#: apt-pkg/deb/dpkgpm.cc:832
1686 #, c-format
1687 msgid "Preparing to completely remove %s"
1688 msgstr ""
1689
1690-#: apt-pkg/deb/dpkgpm.cc:837
1691+#: apt-pkg/deb/dpkgpm.cc:833
1692 #, c-format
1693 msgid "Completely removed %s"
1694 msgstr ""
1695
1696-#: apt-pkg/deb/dpkgpm.cc:1043
1697+#: apt-pkg/deb/dpkgpm.cc:1039
1698 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
1699 msgstr ""
1700
1701-#: apt-pkg/deb/dpkgpm.cc:1074
1702+#: apt-pkg/deb/dpkgpm.cc:1070
1703 msgid "Running dpkg"
1704 msgstr ""
1705
1706-#: apt-pkg/deb/dpkgpm.cc:1277
1707+#: apt-pkg/deb/dpkgpm.cc:1273
1708 msgid "No apport report written because MaxReports is reached already"
1709 msgstr ""
1710
1711 #. check if its not a follow up error
1712-#: apt-pkg/deb/dpkgpm.cc:1282
1713+#: apt-pkg/deb/dpkgpm.cc:1278
1714 msgid "dependency problems - leaving unconfigured"
1715 msgstr ""
1716
1717-#: apt-pkg/deb/dpkgpm.cc:1284
1718+#: apt-pkg/deb/dpkgpm.cc:1280
1719 msgid ""
1720 "No apport report written because the error message indicates its a followup "
1721 "error from a previous failure."
1722 msgstr ""
1723
1724-#: apt-pkg/deb/dpkgpm.cc:1290
1725+#: apt-pkg/deb/dpkgpm.cc:1286
1726 msgid ""
1727 "No apport report written because the error message indicates a disk full "
1728 "error"
1729 msgstr ""
1730
1731-#: apt-pkg/deb/dpkgpm.cc:1296
1732+#: apt-pkg/deb/dpkgpm.cc:1293
1733 msgid ""
1734 "No apport report written because the error message indicates a out of memory "
1735 "error"
1736 msgstr ""
1737
1738-#: apt-pkg/deb/dpkgpm.cc:1303
1739+#. do not report dpkg I/O errors, this is a format string, so we compare
1740+#. the prefix and the suffix of the error with the dpkg error message
1741+#: apt-pkg/deb/dpkgpm.cc:1299
1742+#, c-format
1743+msgid "short read in buffer_copy %s"
1744+msgstr ""
1745+
1746+#: apt-pkg/deb/dpkgpm.cc:1309
1747 msgid ""
1748 "No apport report written because the error message indicates a dpkg I/O error"
1749 msgstr ""
1750@@ -3075,14 +3133,14 @@
1751 msgid "[Mirror: %s]"
1752 msgstr ""
1753
1754-#: methods/rred.cc:465
1755+#: methods/rred.cc:503
1756 #, c-format
1757 msgid ""
1758 "Could not patch %s with mmap and with file operation usage - the patch seems "
1759 "to be corrupt."
1760 msgstr ""
1761
1762-#: methods/rred.cc:470
1763+#: methods/rred.cc:508
1764 #, c-format
1765 msgid ""
1766 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "

Subscribers

People subscribed via source and target branches

to all changes: