diff options
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/algorithms.h | 2 | ||||
| -rw-r--r-- | apt-pkg/edsp/edspindexfile.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/packagemanager.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/pkgcache.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/pkgsystem.h | 2 | ||||
| -rw-r--r-- | apt-pkg/sourcelist.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/sourcelist.h | 2 |
7 files changed, 8 insertions, 8 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 |