summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2018-11-25 17:38:31 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2018-11-25 17:38:31 +0100
commitf313e09d167cc7a83846ac9d4d5d72ba10cc2638 (patch)
tree480544a2e116383ea0744125f5dfb137c8669be2
parent78d9037a80109d942f353fe78958417428240f72 (diff)
Fix typo reported by codespell in code comments
No user visible change expect for some years old changelog entries, so we don't really need to add a new one for this… Reported-By: codespell Gbp-Dch: Ignore
-rw-r--r--apt-pkg/acquire-item.h2
-rw-r--r--apt-pkg/acquire-worker.h6
-rw-r--r--apt-pkg/cdrom.cc2
-rw-r--r--apt-pkg/contrib/fileutl.h2
-rw-r--r--apt-pkg/contrib/strutl.cc2
-rw-r--r--apt-pkg/pkgcache.cc2
-rw-r--r--apt-pkg/pkgcachegen.cc2
-rw-r--r--apt-private/private-json-hooks.cc2
-rw-r--r--debian/changelog8
-rw-r--r--methods/cdrom.cc2
-rwxr-xr-xtest/integration/test-apt-sources-deb8222
11 files changed, 16 insertions, 16 deletions
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 3a5a518c2..4a1378922 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -571,7 +571,7 @@ class APT_HIDDEN pkgAcqMetaSig : public pkgAcqTransactionItem
virtual ~pkgAcqMetaSig();
};
/*}}}*/
-/** \brief An item repsonsible for downloading clearsigned metaindexes {{{*/
+/** \brief An item responsible for downloading clearsigned metaindexes {{{*/
class APT_HIDDEN pkgAcqMetaClearSig : public pkgAcqMetaIndex
{
void * const d;
diff --git a/apt-pkg/acquire-worker.h b/apt-pkg/acquire-worker.h
index f04db2b3c..11e54b060 100644
--- a/apt-pkg/acquire-worker.h
+++ b/apt-pkg/acquire-worker.h
@@ -3,9 +3,9 @@
/* ######################################################################
Acquire Worker - Worker process manager
-
- Each worker class is associated with exaclty one subprocess.
-
+
+ Each worker class is associated with exactly one subprocess.
+
##################################################################### */
/*}}}*/
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 2c8aee815..2c3979ff9 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -721,7 +721,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
DropRepeats(List,"Packages");
DropRepeats(SourceList,"Sources");
// FIXME: We ignore stat() errors here as we usually have only one of those in use
- // This has little potencial to drop 'valid' stat() errors as we know that one of these
+ // This has little potential to drop 'valid' stat() errors as we know that one of these
// files need to exist, but it would be better if we would check it here
_error->PushToStack();
DropRepeats(SigList,"Release.gpg");
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index c78f1715c..46a87a4e2 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -278,7 +278,7 @@ std::vector<std::string> Glob(std::string const &pattern, int flags=0);
/** \brief Popen() implementation that execv() instead of using a shell
*
* \param Args the execv style command to run
- * \param FileFd is a referenz to the FileFd to use for input or output
+ * \param FileFd is a reference to the FileFd to use for input or output
* \param Child a reference to the integer that stores the child pid
* Note that you must call ExecWait() or similar to cleanup
* \param Mode is either FileFd::ReadOnly or FileFd::WriteOnly
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index a569173af..2e3e025ec 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -772,7 +772,7 @@ std::string LookupTag(const std::string &Message, const char *TagC, const char *
// StringToBool - Converts a string into a boolean /*{{{*/
// ---------------------------------------------------------------------
/* This inspects the string to see if it is true or if it is false and
- then returns the result. Several varients on true/false are checked. */
+ then returns the result. Several variants on true/false are checked. */
int StringToBool(const string &Text,int Default)
{
char *ParseEnd;
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 92f0cb777..058e389a5 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -10,7 +10,7 @@
This is the general utility functions for cache management. They provide
a complete set of accessor functions for the cache. The cacheiterators
header contains the STL-like iterators that can be used to easially
- navigate the cache as well as seemlessly dereference the mmap'd
+ navigate the cache as well as seamlessly dereference the mmap'd
indexes. Use these always.
The main class provides for ways to get package indexes and some
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 8fe1867d7..5a3b65b3a 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -154,7 +154,7 @@ void pkgCacheGenerator::ReMap(void const * const oldMap, void const * const newM
return;
if (_config->FindB("Debug::pkgCacheGen", false))
- std::clog << "Remaping from " << oldMap << " to " << newMap << std::endl;
+ std::clog << "Remapping from " << oldMap << " to " << newMap << std::endl;
Cache.ReMap(false);
diff --git a/apt-private/private-json-hooks.cc b/apt-private/private-json-hooks.cc
index 0e4b4913b..b5c1a7172 100644
--- a/apt-private/private-json-hooks.cc
+++ b/apt-private/private-json-hooks.cc
@@ -176,7 +176,7 @@ class APT_HIDDEN JsonWriter
};
/**
- * @brief Wrtie a VerIterator to a JsonWriter
+ * @brief Write a VerIterator to a JsonWriter
*/
static void verIterToJson(JsonWriter &writer, CacheFile &Cache, pkgCache::VerIterator const &Ver)
{
diff --git a/debian/changelog b/debian/changelog
index 6bce99e1d..5347cb129 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2744,7 +2744,7 @@ apt (1.0.9) unstable; urgency=high
* SECURITY UPDATE:
- incorrect invalidating of unauthenticated data (CVE-2014-0488)
- - incorect verification of 304 reply (CVE-2014-0487)
+ - incorrect verification of 304 reply (CVE-2014-0487)
- incorrect verification of Acquire::Gzip indexes (CVE-2014-0489)
-- Michael Vogt <mvo@debian.org> Mon, 15 Sep 2014 08:34:46 +0200
@@ -3651,7 +3651,7 @@ apt (0.9.9.4) unstable; urgency=low
[ David Kalnischkies ]
* pick up Translation-* even if only compressed available (Closes: 717665)
- * request absolute URIs from proxies again (0.9.9.3 regession)
+ * request absolute URIs from proxies again (0.9.9.3 regression)
(Closes: 717891)
[ Michael vogt ]
@@ -8066,7 +8066,7 @@ apt (0.7.12) unstable; urgency=low
that can be used to sign the archive signing keys. This should
make key-rollover easier.
* apt-pkg/deb/dpkgpm.cc:
- - merged patch from Kees Cook to fix anoying upper-case display
+ - merged patch from Kees Cook to fix annoying upper-case display
on amd64 in sbuild
* apt-pkg/algorithms.cc:
- add APT::Update::Post-Invoke-Success script slot
@@ -9166,7 +9166,7 @@ apt (0.6.33) hoary; urgency=low
- patch-1: cosmetic changes (whitespace, "Apt::GPGV->APT::GPGV")
- patch-2: (doc) documentation for gpgv
- patch-3: (doc) new config variables added configure-index
- - patch-4: pkgAcquire::Run() pulse intervall can be configured
+ - patch-4: pkgAcquire::Run() pulse interval can be configured
- patch-5: fix for apt-get update removing Release.gpg files (#6865)
- patch-6: change the path scoring in apt-cdrom, prefer paths without
symlinks
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index d8c032744..77270b09f 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -96,7 +96,7 @@ string CDROMMethod::GetID(string Name)
/*}}}*/
// CDROMMethod::AutoDetectAndMount /*{{{*/
// ---------------------------------------------------------------------
-/* Modifies class varaiable CDROM to the mountpoint */
+/* Modifies class variable CDROM to the mountpoint */
bool CDROMMethod::AutoDetectAndMount(const URI Get, string &NewID)
{
vector<struct CdromDevice> v = UdevCdroms.Scan();
diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index e2cf4d980..fdf26fe97 100755
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -19,7 +19,7 @@ Types: deb
URIs: http://ftp.debian.org/debian
Suites: stable
Components: main
-Description: summay
+Description: summary
# comments are ignored
and the long part'