diff options
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/algorithms.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/contrib/mmap.h | 2 | ||||
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/deb/debversion.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/depcache.cc | 10 | ||||
| -rw-r--r-- | apt-pkg/depcache.h | 4 | ||||
| -rw-r--r-- | apt-pkg/indexfile.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/orderlist.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 21d990fba..8da8b7242 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1901,7 +1901,7 @@ void pkgAcqMetaClearSig::Failed(string const &Message,pkgAcquire::MethodConfig c // if we expected a ClearTextSignature (InRelease) but got a network // error or got a file, but it wasn't valid, we end up here (see VerifyDone). // As these is usually called by web-portals we do not try Release/Release.gpg - // as this is gonna fail anyway and instead abort our try (LP#346386) + // as this is going to fail anyway and instead abort our try (LP#346386) _error->PushToStack(); _error->Error(_("Failed to fetch %s %s"), Target.URI.c_str(), ErrorText.c_str()); if (Target.Option(IndexTarget::INRELEASE_PATH).empty() == true && AllowInsecureRepositories(InsecureType::UNSIGNED, Target.Description, TransactionManager->MetaIndexParser, TransactionManager, this) == true) diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 6cbf8b7aa..c557d77bd 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -879,7 +879,7 @@ bool pkgAcquire::Worker::MethodFailure() { _error->Error("Method %s has died unexpectedly!",Access.c_str()); - // do not reap the child here to show meaningfull error to the user + // do not reap the child here to show meaningful error to the user ExecWait(Process,Access.c_str(),false); Process = -1; close(InFd); diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 643ff8afd..42b5cb44d 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -148,7 +148,7 @@ bool pkgSimulate::RealInstall(PkgIterator iPkg,string /*File*/) /*}}}*/ // Simulate::Configure - Simulate configuration of a Package /*{{{*/ // --------------------------------------------------------------------- -/* This is not an acurate simulation of relatity, we should really not +/* This is not an accurate simulation of relatity, we should really not install the package.. For some investigations it may be necessary however. */ bool pkgSimulate::Configure(PkgIterator iPkg) diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index c194de534..55b40147a 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -37,7 +37,7 @@ using std::string; class FileFd; -/* This should be a 32 bit type, larger tyes use too much ram and smaller +/* This should be a 32 bit type, larger types use too much ram and smaller types are too small. Where ever possible 'unsigned long' should be used instead of this internal type */ typedef unsigned int map_ptrloc; diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 638f09e9d..7507fff29 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -692,7 +692,7 @@ int stringcasecmp(string::const_iterator A,string::const_iterator AEnd, } #endif /*}}}*/ -// LookupTag - Lookup the value of a tag in a taged string /*{{{*/ +// LookupTag - Lookup the value of a tag in a tagged string /*{{{*/ // --------------------------------------------------------------------- /* The format is like those used in package files and the method communication system */ @@ -1001,7 +1001,7 @@ static time_t timegm(struct tm *t) bool RFC1123StrToTime(const char* const str,time_t &time) { unsigned short day = 0; - signed int year = 0; // yes, Y23K problem – we gonna worry then… + signed int year = 0; // yes, Y23K problem – we going to worry then… std::string weekday, month, datespec, timespec, zone; std::istringstream ss(str); auto const &posix = std::locale::classic(); diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index 9fe2fd6b3..4f301c98e 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -203,7 +203,7 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd, /*}}}*/ // debVS::CheckDep - Check a single dependency /*{{{*/ // --------------------------------------------------------------------- -/* This simply preforms the version comparison and switch based on +/* This simply performs the version comparison and switch based on operator. If DepVer is 0 then we are comparing against a provides with no version. */ bool debVersioningSystem::CheckDep(const char *PkgVer, diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 3787106f7..bc9738baa 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -414,7 +414,7 @@ bool pkgDepCache::CheckDep(DepIterator const &Dep,int const Type,PkgIterator &Re /*}}}*/ // DepCache::AddSizes - Add the packages sizes to the counters /*{{{*/ // --------------------------------------------------------------------- -/* Call with Inverse = true to preform the inverse opration */ +/* Call with Inverse = true to perform the inverse opration */ void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const Inverse) { StateCache &P = PkgState[Pkg->ID]; @@ -480,10 +480,10 @@ void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const Inverse) /*}}}*/ // DepCache::AddStates - Add the package to the state counter /*{{{*/ // --------------------------------------------------------------------- -/* This routine is tricky to use, you must make sure that it is never +/* This routine is tricky to use, you must make sure that it is never called twice for the same package. This means the Remove/Add section - should be as short as possible and not encompass any code that will - calld Remove/Add itself. Remember, dependencies can be circular so + should be as short as possible and not encompass any code that will + call Remove/Add itself. Remember, dependencies can be circular so while processing a dep for Pkg it is possible that Add/Remove will be called on Pkg */ void pkgDepCache::AddStates(const PkgIterator &Pkg, bool const Invert) @@ -600,7 +600,7 @@ unsigned char pkgDepCache::VersionState(DepIterator D, unsigned char const Check // DepCache::DependencyState - Compute the 3 results for a dep /*{{{*/ // --------------------------------------------------------------------- /* This is the main dependency computation bit. It computes the 3 main - results for a dependencys, Now, Install and Candidate. Callers must + results for a dependency: Now, Install and Candidate. Callers must invert the result if dealing with conflicts. */ unsigned char pkgDepCache::DependencyState(DepIterator const &D) { diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 87b42b7ca..4536f3b52 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -22,7 +22,7 @@ Now - Compared using the Currently install version Install - Compared using the install version (final state) CVer - (Candidate Version) Compared using the Candidate Version - The candidate and now results are used to decide wheather a package + The candidate and now results are used to decide whether a package should be automatically installed or if it should be left alone. Remember, the Candidate Version is selected based on the distribution @@ -182,7 +182,7 @@ class pkgDepCache : protected pkgCache::Namespace /** \brief Clean up the action group before it is destroyed. * - * If it is destroyed later, no second cleanup wil be run. + * If it is destroyed later, no second cleanup will be run. */ void release(); diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index 96ae2f93b..3a36ce65c 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -3,7 +3,7 @@ // $Id: indexfile.cc,v 1.2.2.1 2003/12/24 23:09:17 mdz Exp $ /* ###################################################################### - Index File - Abstraction for an index of archive/souce file. + Index File - Abstraction for an index of archive/source file. ##################################################################### */ /*}}}*/ diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 927a5cca0..2452b217b 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -123,7 +123,7 @@ static bool pkgInitArchTupleMap() // --------------------------------------------------------------------- /* Directories are specified in such a way that the FindDir function will understand them. That is, if they don't start with a / then their parent - is prepended, this allows a fair degree of flexability. */ + is prepended, this allows a fair degree of flexibility. */ bool pkgInitConfig(Configuration &Cnf) { // General APT things diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index c968845ce..937e538ba 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -665,7 +665,7 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D) continue; /* For reverse dependencies we wish to check if the - dependency is satisifed in the install state. The + dependency is satisfied in the install state. The target package (caller) is going to be in the installed state. */ if (CheckDep(D) == true) diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 8fa231862..37fa442ad 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -1588,7 +1588,7 @@ static bool BuildCache(pkgCacheGenerator &Gen, /* This makes sure that the status cache (the cache that has all index files from the sources list and all local ones) is ready to be mmaped. If OutMap is not zero then a MMap object representing - the cache will be stored there. This is pretty much mandetory if you + the cache will be stored there. This is pretty much mandatory if you are using AllowMem. AllowMem lets the function be run as non-root where it builds the cache 'fast' into a memory buffer. */ static DynamicMMap* CreateDynamicMMap(FileFd * const CacheF, unsigned long Flags) |