summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2019-07-10 16:15:30 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2019-07-10 16:15:30 +0200
commit5cfbc5727dba2f4662d24cf4deb7cab7cdd57c14 (patch)
tree833d5b53bc16a93085b4afe855eaafed15981119
parent2b734a7ec429825c7007c1093883229e069d36c7 (diff)
Fix typos reported by codespell in code comments
Also in old changelogs, but nothing really user visible like error messages or alike so barely noteworthy. Reported-By: codespell Gbp-Dch: Ignore
-rw-r--r--apt-pkg/algorithms.h2
-rw-r--r--apt-pkg/edsp/edspindexfile.cc4
-rw-r--r--apt-pkg/packagemanager.cc2
-rw-r--r--apt-pkg/pkgcache.cc2
-rw-r--r--apt-pkg/pkgsystem.h2
-rw-r--r--apt-pkg/sourcelist.cc2
-rw-r--r--apt-pkg/sourcelist.h2
-rw-r--r--cmdline/apt-helper.cc2
-rw-r--r--debian/changelog4
-rw-r--r--debian/libapt-pkg-doc.doc-base.dpkg-tech2
-rw-r--r--methods/http.cc7
-rw-r--r--methods/rfc2553emu.cc4
-rwxr-xr-xtest/integration/test-apt-cache-showsrc6
-rwxr-xr-xtest/integration/test-hashsum-verification2
14 files changed, 22 insertions, 21 deletions
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 21d79367b..789f304a9 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -16,7 +16,7 @@
pkgFixBroken corrects a broken system so that it is in a sane state.
- pkgAllUpgrade attempts to upgade as many packages as possible but
+ pkgAllUpgrade attempts to upgrade as many packages as possible but
without installing new packages.
The problem resolver class contains a number of complex algorithms
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index 1a8af89f0..faade6e0a 100644
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -96,7 +96,7 @@ class APT_HIDDEN edspIFType: public pkgIndexFile::Type
public:
virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &) const APT_OVERRIDE
{
- // we don't have a record parser for this type as the file is not presistent
+ // we don't have a record parser for this type as the file is not persistent
return NULL;
};
edspIFType() {Label = "EDSP scenario file";};
@@ -112,7 +112,7 @@ class APT_HIDDEN eippIFType: public pkgIndexFile::Type
public:
virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &) const APT_OVERRIDE
{
- // we don't have a record parser for this type as the file is not presistent
+ // we don't have a record parser for this type as the file is not persistent
return NULL;
};
eippIFType() {Label = "EIPP scenario file";};
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 21905c7b6..e58589d73 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -918,7 +918,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
else
{
if (Debug)
- clog << OutputInDepth(Depth) << "So temprorary remove/deconfigure " << ConflictPkg.FullName() << " to satisfy " << APT::PrettyDep(&Cache, End) << endl;
+ clog << OutputInDepth(Depth) << "So temporary remove/deconfigure " << ConflictPkg.FullName() << " to satisfy " << APT::PrettyDep(&Cache, End) << endl;
if (EarlyRemove(ConflictPkg, &End) == false)
return _error->Error("Internal Error, Could not early remove %s (%d)",ConflictPkg.FullName().c_str(), 2);
}
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index cbb67820a..ba9a39f13 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -128,7 +128,7 @@ bool pkgCache::Header::CheckSizes(Header &Against) const
pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map), VS(nullptr), d(NULL)
{
// call getArchitectures() with cached=false to ensure that the
- // architectures cache is re-evaulated. this is needed in cases
+ // architectures cache is re-evaluated. this is needed in cases
// when the APT::Architecture field changes between two cache creations
MultiArchEnabled = APT::Configuration::getArchitectures(false).size() > 1;
if (DoMap == true)
diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index 1be2668ff..051b11ac2 100644
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -83,7 +83,7 @@ class pkgSystem
virtual bool FindIndex(pkgCache::PkgFileIterator File,
pkgIndexFile *&Found) const = 0;
- /* Evauluate how 'right' we are for this system based on the filesystem
+ /* Evaluate how 'right' we are for this system based on the filesystem
etc.. */
virtual signed Score(Configuration const &/*Cnf*/) {
return 0;
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index eef4d8a7f..cd7dbce9c 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -215,7 +215,7 @@ bool pkgSourceList::Type::ParseLine(vector<metaIndex *> &List,
// get one option, e.g. option1=value1
string option;
if (ParseQuoteWord(Buffer,option) == false)
- return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "[option] unparseable");
+ return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "[option] unparsable");
if (option.length() < 3)
return _error->Error(_("Malformed entry %u in %s file %s (%s)"), CurLine, "list", File.c_str(), "[option] too short");
diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index efbf4bfbc..91dc03dcf 100644
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -108,7 +108,7 @@ class pkgSourceList
/** \brief add file for parsing, but not to the cache
*
- * pkgIndexFiles origining from pkgSourcesList are included in
+ * pkgIndexFiles originating from pkgSourcesList are included in
* srcpkgcache, the status files added via #AddStatusFiles are
* included in pkgcache, but these files here are not included in
* any cache to have the possibility of having a file included just
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index e52fba39f..97a4342f5 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -67,7 +67,7 @@ static bool DoDownloadFile(CommandLine &CmdL) /*{{{*/
fileind += 2;
- // An empty string counts as a hash for compatability reasons
+ // An empty string counts as a hash for compatibility reasons
if (CmdL.FileSize() > fileind + 1 && *CmdL.FileList[fileind + 1] == '\0')
fileind++;
diff --git a/debian/changelog b/debian/changelog
index a098eeb88..378f6bcb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,7 @@ apt (1.9.0) experimental; urgency=medium
* Use debDebFile to get control file instead of dpkg-deb
* prepare-release: Add bump-abi command
* Change soname to libapt-pkg.so.5.90
- * CMake: Enforce "override" use on overriden methods
+ * CMake: Enforce "override" use on overridden methods
* debmetaindex: Use isspace_ascii() variant to normalize Signed-By
* README.md: Quote -j <count> as code with backticks
* apt-mark: Add hidden showheld alias for showhold
@@ -3518,7 +3518,7 @@ apt (0.9.14.3~exp4) experimental; urgency=medium
- add Description tag for deb822 sources
- add support for Enabled: no in deb822 sources.list
- add support for multiple URIs in deb822 style sources.list
- - add support for multipl types in one line
+ - add support for multiple types in one line
* add integration test for apt search and apt show
* do not ignore ioctl(TIOCSCTTY) errors
diff --git a/debian/libapt-pkg-doc.doc-base.dpkg-tech b/debian/libapt-pkg-doc.doc-base.dpkg-tech
index 055e8e674..823a7cb02 100644
--- a/debian/libapt-pkg-doc.doc-base.dpkg-tech
+++ b/debian/libapt-pkg-doc.doc-base.dpkg-tech
@@ -1,5 +1,5 @@
Document: libapt-pkg-doc-dpkg-tech
-Title: APT's interpetation of DPkg Technical Specification
+Title: APT's interpretation of DPkg Technical Specification
Author: Jason Gunthorpe
Abstract: The DPkg Technical Manual gives an overview of dpkg's external
functions(as APT sees them) and describes how it views the world.
diff --git a/methods/http.cc b/methods/http.cc
index 0a29109fb..bd866d321 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -974,9 +974,10 @@ void HttpMethod::SendReq(FetchItem *Itm)
Req << "User-Agent: " << ConfigFind("User-Agent",
"Debian APT-HTTP/1.3 (" PACKAGE_VERSION ")") << "\r\n";
- auto const referer = ConfigFind("Referer", "");
- if (referer.empty() == false)
- Req << "Referer: " << referer << "\r\n";
+ // the famously typoed HTTP header field
+ auto const referrer = ConfigFind("Referer", "");
+ if (referrer.empty() == false)
+ Req << "Referer: " << referrer << "\r\n";
Req << "\r\n";
diff --git a/methods/rfc2553emu.cc b/methods/rfc2553emu.cc
index 72b3fc42b..41aa7470e 100644
--- a/methods/rfc2553emu.cc
+++ b/methods/rfc2553emu.cc
@@ -202,7 +202,7 @@ int getnameinfo(const struct sockaddr *sa, socklen_t salen,
}
}
- // Resolve as a plain numberic
+ // Resolve as a plain numeric
if ((flags & NI_NUMERICHOST) == NI_NUMERICHOST)
{
strncpy(host,inet_ntoa(sin->sin_addr),hostlen);
@@ -231,7 +231,7 @@ int getnameinfo(const struct sockaddr *sa, socklen_t salen,
}
}
- // Resolve as a plain numberic
+ // Resolve as a plain numeric
if ((flags & NI_NUMERICSERV) == NI_NUMERICSERV)
{
snprintf(serv,servlen,"%u",ntohs(sin->sin_port));
diff --git a/test/integration/test-apt-cache-showsrc b/test/integration/test-apt-cache-showsrc
index 88de077fc..d3f61d972 100755
--- a/test/integration/test-apt-cache-showsrc
+++ b/test/integration/test-apt-cache-showsrc
@@ -11,7 +11,7 @@ configarchitecture "i386"
insertsource 'unstable' 'foo' 'all' '1.0' '' 'foo-binary'
# and a similar one that builds a foo binary package
-insertsource 'unstable' 'unreleated' 'all' '1.0' '' 'foo'
+insertsource 'unstable' 'unrelated' 'all' '1.0' '' 'foo'
# just here to workaround the need for a authenticated package
insertpackage 'unstable' 'workaround' 'all' '1.0'
@@ -22,10 +22,10 @@ setupaptarchive
# and show all matches
aptcache showsrc foo > output.txt
testsuccess grep "Package: foo" output.txt
-testsuccess grep "Package: unreleated" output.txt
+testsuccess grep "Package: unrelated" output.txt
# by default apt-cache showsrc will look into "binary" and "source" names
# and show all matches
aptcache showsrc --only-source foo > output.txt
testsuccess grep "Package: foo" output.txt
-testfailure grep "Package: unreleated" output.txt
+testfailure grep "Package: unrelated" output.txt
diff --git a/test/integration/test-hashsum-verification b/test/integration/test-hashsum-verification
index a514b85e2..4060dfbba 100755
--- a/test/integration/test-hashsum-verification
+++ b/test/integration/test-hashsum-verification
@@ -22,7 +22,7 @@ prepare() {
cp "$1" aptarchive/Packages
find aptarchive -name 'Release' -delete
compressfile aptarchive/Packages
- # create Release file with incorret checksums
+ # create Release file with incorrect checksums
cat > aptarchive/Release <<EOF
Date: Fri, 05 Aug 2011 09:22:08 UTC
MD5Sum: