diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-31 18:35:21 +0000 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-03-31 18:35:21 +0000 |
commit | 06f02b954f5c4ca7cb9cc288ea5a8fcb6a1052d4 (patch) | |
tree | c13a240d862ab3f62121062d4961b75a63d01e97 /ftparchive | |
parent | 89eaeb446c24bbeacc5f69c170cf60104854432e (diff) | |
parent | 0edc7fba37048fa7c9833d664c4231ee9ad2be40 (diff) |
* merged with matts tree
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-72
Open 0.6.36
* apt@packages.debian.org/apt--main--0--patch-73
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-74
Update changelog
* apt@packages.debian.org/apt--main--0--patch-75
Merge bubulle@debian.org--2005/apt--main--0
* apt@packages.debian.org/apt--main--0--patch-76
Update changelog
* bubulle@debian.org--2005/apt--main--0--patch-58
Correct file permissions
* bubulle@debian.org--2005/apt--main--0--patch-59
Bring consistency to the use of capitals in programs messages
* bubulle@debian.org--2005/apt--main--0--patch-60
Correct the permission change on configure.in
* bubulle@debian.org--2005/apt--main--0--patch-61
Complete unfuzzification of PO files after the capitalization fixes
* bubulle@debian.org--2005/apt--main--0--patch-62
Final work of capitalization cleaning and translation unfuzzyfication
* bubulle@debian.org--2005/apt--main--0--patch-63
Correct the "arbitary" typo in apt-ftparchive
* bubulle@debian.org--2005/apt--main--0--patch-64
Italian translation update
* bubulle@debian.org--2005/apt--main--0--patch-65
Italian translation update
Diffstat (limited to 'ftparchive')
-rw-r--r-- | ftparchive/apt-ftparchive.cc | 16 | ||||
-rw-r--r-- | ftparchive/contents.cc | 2 | ||||
-rw-r--r-- | ftparchive/multicompress.cc | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 62a5e7cc9..31ff8d600 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -162,7 +162,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats) if (PkgExt.empty() == false && Packages.SetExts(PkgExt) == false) return _error->Error(_("Package extension list is too long")); if (_error->PendingError() == true) - return _error->Error(_("Error Processing directory %s"),BaseDir.c_str()); + return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); Packages.PathPrefix = PathPrefix; Packages.DirStrip = ArchiveDir; @@ -176,7 +176,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats) PkgCompress,Permissions); Packages.Output = Comp.Input; if (_error->PendingError() == true) - return _error->Error(_("Error Processing directory %s"),BaseDir.c_str()); + return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); c0out << ' ' << BaseDir << ":" << flush; @@ -199,7 +199,7 @@ bool PackageMap::GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats) if (Comp.Finalize(Size) == false) { c0out << endl; - return _error->Error(_("Error Processing directory %s"),BaseDir.c_str()); + return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); } if (Size != 0) @@ -249,7 +249,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats) if (SrcExt.empty() == false && Sources.SetExts(SrcExt) == false) return _error->Error(_("Source extension list is too long")); if (_error->PendingError() == true) - return _error->Error(_("Error Processing directory %s"),BaseDir.c_str()); + return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); Sources.PathPrefix = PathPrefix; Sources.DirStrip = ArchiveDir; @@ -263,7 +263,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats) SrcCompress,Permissions); Sources.Output = Comp.Input; if (_error->PendingError() == true) - return _error->Error(_("Error Processing directory %s"),BaseDir.c_str()); + return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); c0out << ' ' << BaseDir << ":" << flush; @@ -285,7 +285,7 @@ bool PackageMap::GenSources(Configuration &Setup,struct CacheDB::Stats &Stats) if (Comp.Finalize(Size) == false) { c0out << endl; - return _error->Error(_("Error Processing directory %s"),BaseDir.c_str()); + return _error->Error(_("Error processing directory %s"),BaseDir.c_str()); } if (Size != 0) @@ -394,7 +394,7 @@ bool PackageMap::GenContents(Configuration &Setup, if (Comp.Finalize(Size) == false || _error->PendingError() == true) { c0out << endl; - return _error->Error(_("Error Processing Contents %s"), + return _error->Error(_("Error processing contents %s"), this->Contents.c_str()); } @@ -585,7 +585,7 @@ bool ShowHelp(CommandLine &CmdL) " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" - " -o=? Set an arbitary configuration option") << endl; + " -o=? Set an arbitrary configuration option") << endl; return true; } diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index e11c16ca2..3801995bd 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -314,7 +314,7 @@ bool ContentsExtract::Read(debDebFile &Deb) Compressor = "bzip2"; } if (Member == 0) { - _error->Error(_("Internal Error, could not locate member %s"),"data.tar.gz"); + _error->Error(_("Internal error, could not locate member %s"),"data.tar.gz"); return false; } diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 5073e98ac..a3512c787 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -72,7 +72,7 @@ MultiCompress::MultiCompress(string Output,string Compress, // Hmm.. unknown. if (Comp->Name == 0) { - _error->Warning(_("Unknown Compresison Algorithm '%s'"),string(Start,I).c_str()); + _error->Warning(_("Unknown compression algorithm '%s'"),string(Start,I).c_str()); continue; } @@ -212,7 +212,7 @@ bool MultiCompress::Die() fclose(Input); Input = 0; - bool Res = ExecWait(Outputter,_("Compress Child"),false); + bool Res = ExecWait(Outputter,_("Compress child"),false); Outputter = -1; return Res; } @@ -235,7 +235,7 @@ bool MultiCompress::Finalize(unsigned long &OutSize) { struct stat St; if (stat(I->Output.c_str(),&St) != 0) - return _error->Error(_("Internal Error, Failed to create %s"), + return _error->Error(_("Internal error, failed to create %s"), I->Output.c_str()); if (I->OldMTime != St.st_mtime) |