summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorVeres Lajos <vlajos@gmail.com>2016-03-07 00:13:26 +0100
committerJulian Andres Klode <jak@debian.org>2016-03-07 00:14:48 +0100
commit8d89cda7d66b6f125c457f36beeb84abb0df07f1 (patch)
tree1e0b4960ed4b738099e0c48e230c8cf09a513791 /apt-pkg
parentf009dd15f385e9df4ca0482a940870350ba2d160 (diff)
Fix several typos
This effectively merges branch 'typofixes-vlajos-20150807' of github.com:vlajos/apt with the following commit: commit 13cacb3e2e2352ba701e769fc889e3344fabbf7e Author: Veres Lajos <vlajos@gmail.com> Date: Sun Aug 9 00:12:53 2015 +0100 typofix - https://github.com/vlajos/misspell_fixer It has been rebased for a better commit message.
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-item.cc4
-rw-r--r--apt-pkg/algorithms.h4
-rw-r--r--apt-pkg/cdrom.cc4
-rw-r--r--apt-pkg/contrib/strutl.cc2
-rw-r--r--apt-pkg/contrib/strutl.h2
-rw-r--r--apt-pkg/deb/dpkgpm.cc2
-rw-r--r--apt-pkg/deb/dpkgpm.h2
-rw-r--r--apt-pkg/packagemanager.cc6
-rw-r--r--apt-pkg/pkgcache.cc4
9 files changed, 15 insertions, 15 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index ad40f8974..2cf6b60a8 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -52,7 +52,7 @@
using namespace std;
-static void printHashSumComparision(std::string const &URI, HashStringList const &Expected, HashStringList const &Actual) /*{{{*/
+static void printHashSumComparison(std::string const &URI, HashStringList const &Expected, HashStringList const &Actual) /*{{{*/
{
if (_config->FindB("Debug::Acquire::HashSumMismatch", false) == false)
return;
@@ -1821,7 +1821,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile) /*{{{*/
if (Debug == true)
{
std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": Index has different hashes than parser, probably older, so fail pdiffing" << std::endl;
- printHashSumComparision(CurrentPackagesFile, ServerHashes, TargetFileHashes);
+ printHashSumComparison(CurrentPackagesFile, ServerHashes, TargetFileHashes);
}
return false;
}
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 1a9d5aefd..5b0d8fb29 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -75,8 +75,8 @@ class pkgSimulate : public pkgPackageManager /*{{{*/
Policy iPolicy;
pkgDepCache Sim;
pkgDepCache::ActionGroup group;
-
- // The Actuall installation implementation
+
+ // The Actual installation implementation
virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE;
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 5613459e7..d83d05f9e 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -367,7 +367,7 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
/*}}}*/
// ReduceSourceList - Takes the path list and reduces it /*{{{*/
// ---------------------------------------------------------------------
-/* This takes the list of source list expressed entires and collects
+/* This takes the list of source list expressed entries and collects
similar ones to form a single entry for each dist */
void pkgCdrom::ReduceSourcelist(string /*CD*/,vector<string> &List)
{
@@ -451,7 +451,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
// WriteSourceList - Write an updated sourcelist /*{{{*/
// ---------------------------------------------------------------------
/* This reads the old source list and copies it into the new one. It
- appends the new CDROM entires just after the first block of comments.
+ appends the new CDROM entries just after the first block of comments.
This places them first in the file. It also removes any old entries
that were the same. */
bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 242a78449..d388cbda3 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1217,7 +1217,7 @@ vector<string> StringSplit(std::string const &s, std::string const &sep,
vector<string> split;
size_t start, pos;
- // no seperator given, this is bogus
+ // no separator given, this is bogus
if(sep.size() == 0)
return split;
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index c5c8e2382..ef1172678 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -93,7 +93,7 @@ std::vector<std::string> VectorizeString(std::string const &haystack, char const
*
* \param input The input string.
*
- * \param sep The seperator to use.
+ * \param sep The separator to use.
*
* \param maxsplit (optional) The maximum amount of splitting that
* should be done .
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 1afcb6527..03b096ad6 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1588,7 +1588,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
// Check for an error code.
if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
{
- // if it was set to "keep-dpkg-runing" then we won't return
+ // if it was set to "keep-dpkg-running" then we won't return
// here but keep the loop going and just report it as a error
// for later
bool const stopOnError = _config->FindB("Dpkg::StopOnError",true);
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ff6e16c71..408a37334 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -119,7 +119,7 @@ class pkgDPkgPM : public pkgPackageManager
void DoDpkgStatusFd(int statusfd);
void ProcessDpkgStatusLine(char *line);
- // The Actuall installation implementation
+ // The Actual installation implementation
virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
virtual bool Remove(PkgIterator Pkg,bool Purge = false) APT_OVERRIDE;
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 9cbb3fbd2..d75980e5e 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -6,7 +6,7 @@
Package Manager - Abstacts the package manager
More work is needed in the area of transitioning provides, ie exim
- replacing smail. This can cause interesing side effects.
+ replacing smail. This can cause interesting side effects.
Other cases involving conflicts+replaces should be tested.
@@ -136,7 +136,7 @@ bool pkgPackageManager::FixMissing()
// PM::ImmediateAdd - Add the immediate flag recursivly /*{{{*/
// ---------------------------------------------------------------------
/* This adds the immediate flag to the pkg and recursively to the
- dependendies
+ dependencies
*/
void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
{
@@ -189,7 +189,7 @@ bool pkgPackageManager::CreateOrderList()
if (I->VersionList == 0)
continue;
- // Mark the package and its dependends for immediate configuration
+ // Mark the package and its dependents for immediate configuration
if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
NoImmConfigure == false) || ImmConfigureAll)
{
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 503f85657..159b5e00e 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -500,7 +500,7 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
if (S->CurrentState == pkgCache::State::UnPacked ||
S->CurrentState == pkgCache::State::HalfConfigured)
- // we leave triggers alone complettely. dpkg deals with
+ // we leave triggers alone completely. dpkg deals with
// them in a hard-to-predict manner and if they get
// resolved by dpkg before apt run dpkg --configure on
// the TriggersPending package dpkg returns a error
@@ -802,7 +802,7 @@ bool pkgCache::DepIterator::IsImplicit() const
return false;
}
/*}}}*/
-// ostream operator to handle string representation of a dependecy /*{{{*/
+// ostream operator to handle string representation of a dependency /*{{{*/
// ---------------------------------------------------------------------
/* */
std::ostream& operator<<(std::ostream& out, pkgCache::DepIterator D)