summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-05-17 12:41:45 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-05-17 12:41:45 +0000
commite5e2d17648a0d8f3c9ed3095634b552ed5409059 (patch)
tree75ff8db1fb141872e059374df1c23f01e64fc4ef
parent11680bfd380d52c96feeb76600e50a145838b329 (diff)
* merged with otavoi
Patches applied: * otavio@debian.org--2005/apt--ddtp--0.6--patch-15 Merge changes did by Michael Vogt to solve some rebuilding mistakes. * otavio@debian.org--2005/apt--ddtp--0.6--patch-16 Does't show Description twice * otavio@debian.org--2005/apt--ddtp--0.6--patch-17 Merge last fixes did by Michael but preserve my version of apt-cache.cc fix.
-rw-r--r--cmdline/apt-cache.cc7
-rw-r--r--po/apt-all.pot182
2 files changed, 84 insertions, 105 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 9293a9858..e85492576 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1225,10 +1225,11 @@ bool DisplayRecord(pkgCache::VerIterator V)
return false;
}
- // Strip the Description
+ // Get a pointer to start of Description field
unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "Description:");
- *DescP='\0';
- if (write(STDOUT_FILENO,Buffer, strlen((char*)Buffer)+1) != strlen((char *)Buffer)+1)
+
+ // Write all but Description
+ if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer))
{
delete [] Buffer;
return false;
diff --git a/po/apt-all.pot b/po/apt-all.pot
index d003248ff..bc687c55f 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-13 19:54+0200\n"
+"POT-Creation-Date: 2005-03-06 12:50+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,153 +15,145 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
-#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
-#: cmdline/apt-cache.cc:1401 cmdline/apt-cache.cc:1552
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
msgstr ""
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:232
msgid "Total package names : "
msgstr ""
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
msgstr ""
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr ""
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
msgstr ""
-#: cmdline/apt-cache.cc:293
-msgid "Total Distinct Descriptions: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
msgstr ""
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
msgstr ""
-#: cmdline/apt-cache.cc:300
-msgid "Total Desc/File relations: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
msgstr ""
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:1275
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1429
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr ""
-#: cmdline/apt-cache.cc:1506
+#: cmdline/apt-cache.cc:1462
msgid "Package files:"
msgstr ""
-#: cmdline/apt-cache.cc:1513 cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
-#: cmdline/apt-cache.cc:1514
+#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1579
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr ""
#. Installed version
-#: cmdline/apt-cache.cc:1559
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1569
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr ""
#. Candidate Version
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1585
+#: cmdline/apt-cache.cc:1541
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1600
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1695 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1702
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -239,7 +231,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:806
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -311,7 +303,7 @@ msgid ""
" --no-delink Enable delinking debug mode\n"
" --contents Control contents file generation\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option"
+" -o=? Set an arbitary configuration option"
msgstr ""
#: ftparchive/apt-ftparchive.cc:757
@@ -1309,9 +1301,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:739
-#: apt-pkg/pkgcachegen.cc:808 apt-pkg/pkgcachegen.cc:813
-#: apt-pkg/pkgcachegen.cc:936
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
msgid "Reading package lists"
msgstr ""
@@ -1749,7 +1741,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:984
+#: apt-pkg/contrib/strutl.cc:941
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1946,72 +1938,72 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:135
+#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:141
+#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:146
+#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr ""
@@ -2136,12 +2128,12 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:119
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:135
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2184,87 +2176,73 @@ msgstr ""
msgid "Error occured while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:145
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:151
+#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occured while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:172
+#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occured while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:176
+#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occured while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occured while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:211
+#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occured while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occured while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:239
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:245
+#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:248
+#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:282
+#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occured while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:295
+#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occured while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:670
+#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:754
+#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:881 apt-pkg/pkgcachegen.cc:888
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr ""
@@ -2273,31 +2251,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:929
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:743
+#: apt-pkg/acquire-item.cc:708
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:796
+#: apt-pkg/acquire-item.cc:761
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:832
+#: apt-pkg/acquire-item.cc:797
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:919
+#: apt-pkg/acquire-item.cc:884
msgid "Size mismatch"
msgstr ""