Browse Source

fix a few typos in strings, comments and manpage of apt-ftparchive

thanks Karl Goetz! (Closes: #558757)
tags/debian/0.7.25
David Kalnischkies 11 years ago
parent
commit
ca4907db7c
7 changed files with 12 additions and 9 deletions
  1. +3
    -0
      debian/changelog
  2. +1
    -1
      doc/apt-ftparchive.1.xml
  3. +2
    -2
      ftparchive/apt-ftparchive.cc
  4. +3
    -3
      ftparchive/cachedb.cc
  5. +1
    -1
      ftparchive/contents.cc
  6. +1
    -1
      ftparchive/multicompress.cc
  7. +1
    -1
      ftparchive/writer.cc

+ 3
- 0
debian/changelog View File

@@ -104,6 +104,9 @@ apt (0.7.25) UNRELEASED; urgency=low
* debian/apt.cron.daily:
- check cache size even if we do nothing else otherwise, thanks
Francesco Poli for patch(s) and patience! (Closes: #459344)
* ftparchive/*:
- fix a few typos in strings, comments and manpage,
thanks Karl Goetz! (Closes: #558757)

[ Chris Leick ]
* doc/ various manpages:


+ 1
- 1
doc/apt-ftparchive.1.xml View File

@@ -285,7 +285,7 @@
<varlistentry><term>Sources</term>
<listitem><para>
Sets the output Packages file. Defaults to
Sets the output Sources file. Defaults to
<filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem>
</varlistentry>


+ 2
- 2
ftparchive/apt-ftparchive.cc View File

@@ -3,7 +3,7 @@
// $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $
/* ######################################################################

apt-scanpackages - Efficient work-alike for dpkg-scanpackages
apt-ftparchive - Efficient work-alike for dpkg-scanpackages

Let contents be disabled from the conf
@@ -792,7 +792,7 @@ bool Generate(CommandLine &CmdL)
if (_config->FindB("APT::FTPArchive::Contents",true) == false)
return true;
c1out << "Done Packages, Starting contents." << endl;
c1out << "Packages done, Starting contents." << endl;

// Sort the contents file list by date
string ArchiveDir = Setup.FindDir("Dir::ArchiveDir");


+ 3
- 3
ftparchive/cachedb.cc View File

@@ -69,7 +69,7 @@ bool CacheDB::ReadyDB(string DB)
// apt 0.6.44
if (err == EINVAL)
{
_error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database."));
_error->Error(_("DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database."));
}
if (err)
{
@@ -83,7 +83,7 @@ bool CacheDB::ReadyDB(string DB)
return true;
}
/*}}}*/
// CacheDB::OpenFile - Open the filei /*{{{*/
// CacheDB::OpenFile - Open the file /*{{{*/
// ---------------------------------------------------------------------
/* */
bool CacheDB::OpenFile()
@@ -139,7 +139,7 @@ bool CacheDB::GetCurStat()
if (DBLoaded)
{
/* First see if thre is anything about it
/* First see if there is anything about it
in the database */

/* Get the flags (and mtime) */


+ 1
- 1
ftparchive/contents.cc View File

@@ -13,7 +13,7 @@
removing the massive sort time overhead.
By breaking all the pathnames into components and storing them
separately a space savings is realized by not duplicating the string
separately a space saving is realized by not duplicating the string
over and over again. Ultimately this saving is sacrificed to storage of
the tree structure itself but the tree structure yields a speed gain
in the sorting and processing. Ultimately it takes about 5 seconds to


+ 1
- 1
ftparchive/multicompress.cc View File

@@ -365,7 +365,7 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc)
// MultiCompress::Child - The writer child /*{{{*/
// ---------------------------------------------------------------------
/* The child process forks a bunch of compression children and takes
input on FD and passes it to all the compressor childer. On the way it
input on FD and passes it to all the compressor child. On the way it
computes the MD5 of the raw data. After this the raw data in the
original files is compared to see if this data is new. If the data
is new then the temp files are renamed, otherwise they are erased. */


+ 1
- 1
ftparchive/writer.cc View File

@@ -463,7 +463,7 @@ bool PackagesWriter::DoPackage(string FileName)
SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str());
/* Get rid of the Optional tag. This is an ugly, ugly, ugly hack that
dpkg-scanpackages does.. Well sort of. dpkg-scanpackages just does renaming
dpkg-scanpackages does. Well sort of. dpkg-scanpackages just does renaming
but dpkg does this append bit. So we do the append bit, at least that way the
status file and package file will remain similar. There are other transforms
but optional is the only legacy one still in use for some lazy reason. */


Loading…
Cancel
Save