diff options
36 files changed, 88 insertions, 68 deletions
diff --git a/README.json-hooks.md b/README.json-hooks.md index b47c33b7e..f516c1afe 100644 --- a/README.json-hooks.md +++ b/README.json-hooks.md @@ -59,7 +59,7 @@ The following methods are supported: 1. `org.debian.apt.hooks.install.pre-prompt` - Run before the y/n prompt 1. `org.debian.apt.hooks.install.post` - Run after success -1. `org.debian.apt.hooks.install.fail` - Run after failed instal +1. `org.debian.apt.hooks.install.fail` - Run after failed install 1. `org.debian.apt.hooks.search.pre` - Run before search 1. `org.debian.apt.hooks.search.post` - Run after successful search 1. `org.debian.apt.hooks.search.fail` - Run after search without results 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) diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 5bc5462d2..4c5c606d8 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -131,7 +131,7 @@ net_update() { exit 1 fi # in theory we would need to depend on wget for this, but this feature - # isn't useable in debian anyway as we have no keyring uri nor a master key + # isn't usable in debian anyway as we have no keyring uri nor a master key if ! command_available 'wget'; then apt_error 'wget is required for a network-based update, but it is not installed' exit 1 diff --git a/debian/NEWS b/debian/NEWS index 49e938751..9e77685a7 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,7 +1,7 @@ apt (1.6~rc1) unstable; urgency=medium Seccomp sandboxing has been turned off by default for now. If it works - for you, you are encouraged to reenable it by setting APT::Sandbox::Seccomp + for you, you are encouraged to re-enable it by setting APT::Sandbox::Seccomp to true. -- Julian Andres Klode <jak@debian.org> Fri, 06 Apr 2018 14:14:29 +0200 diff --git a/debian/changelog b/debian/changelog index 08087fccd..7f0528f65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2620,7 +2620,7 @@ apt (1.0.8) unstable; urgency=medium apt (1.0.7) unstable; urgency=medium [ Michael Vogt ] - * add REAMDE.md + * add README.md * StringToBool: only act if the entire string is consumed by strtol() * Use @builddeps@ in the debian/tests/control file * apt-pkg/acquire-item.cc: make pkgAcqDiffIndex more uniform @@ -2932,7 +2932,7 @@ apt (0.9.16) unstable; urgency=medium * add ".*-{kernel,modules}-$KERVER" matcher for hook * ensure that a dot is a dot in the hook * use liblzma-dev to provide xz/lzma support - * use the pretty fullname of a pkg as download desciption + * use the pretty fullname of a pkg as download description [ Johannes Schauer ] * implement BuildProfileSpec support as dpkg has in 1.17.2 (Closes: 661537) @@ -3186,7 +3186,7 @@ apt (0.9.14) unstable; urgency=low * use a substvar to set the archive-keyring in debian/control * cherry-pick ubuntus (disabled) net-update fixes * generate apt-key script with vendor info about keys - * drop old /var/state to /var/lib transition artefacts + * drop old /var/state to /var/lib transition artifacts [ Steve Langasek ] * prepare-release: declare the packages needed as source build deps. @@ -5190,7 +5190,7 @@ apt (0.8.15.1) unstable; urgency=low - Defaults is a vector of Pin not of PkgPin - ensure that only the first specific stanza for a package is used - save all stanzas which had no effect in Unmatched - - allow package:architecure in Package: + - allow package:architecture in Package: -- Michael Vogt <mvo@debian.org> Thu, 30 Jun 2011 10:05:36 +0200 @@ -6374,7 +6374,7 @@ apt (0.7.26~exp8) experimental; urgency=low * apt-pkg/packagemanager.cc: - packages that are not touched doesn't need to be unpacked * debian/control: - - remove intltool's dependency as it is an ubuntu artefact + - remove intltool's dependency as it is an ubuntu artifact * apt-pkg/depcache.cc: - SetCandidateVer for all pseudo packages - SetReInstall for the "all" package of a pseudo package @@ -10372,7 +10372,7 @@ apt (0.3.14) unstable; urgency=low * Tweaked Dselect 'update' script to re-gen the avail file even in the event of a failure Closes: #47112 * Retries for source archives too Closes: #47529 - * Unmounts CDROMs iff it mounted them Closes: #45299 + * Unmounts CDROMs if it mounted them Closes: #45299 * Checks for the partial directories before doing downloads Closes: #47392 * no_proxy environment variable (http only!) Closes: #43476 * apt-cache showsrc Closes: #45799 @@ -10596,7 +10596,7 @@ apt (0.1) unstable; urgency=low * Kludge to fix problem in libnet-perl with illegal anonymous FTP passwords. - * Moved to unstable; apt is in a useable state now. + * Moved to unstable; apt is in a usable state now. * Fixed version numbering. From now on, numbering will be: 0.1 (no actual release) -> 0.1.0bo (release for libc5) -> 0.1.1 (release for unstable). Thanks, Manoj. diff --git a/debian/libapt-inst2.0.symbols b/debian/libapt-inst2.0.symbols index 2416d276b..3687ac95a 100644 --- a/debian/libapt-inst2.0.symbols +++ b/debian/libapt-inst2.0.symbols @@ -60,7 +60,7 @@ libapt-inst.so.2.0 libapt-inst2.0 #MINVER# (c++)"vtable for pkgDirStream@APTINST_2.0" 0.8.0 (c++)"vtable for debDebFile::ControlExtract@APTINST_2.0" 0.8.0 (c++)"vtable for debDebFile::MemControlExtract@APTINST_2.0" 0.8.0 -### gcc artefacts +### gcc artifacts (c++|optional=std)"std::vector<APT::Configuration::Compressor, std::allocator<APT::Configuration::Compressor> >::~vector()@APTINST_2.0" 0.8.12 ### symbol versioning APTINST_2.0@APTINST_2.0 1.1~exp9 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e64de6b77..57179c243 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -525,7 +525,7 @@ APT::Compressor::rev { This will not override the defined list; it will only prefix the list with this type.</para> <para>The special type <literal>uncompressed</literal> can be used to give uncompressed files a preference, but note that most archives don't provide uncompressed files so this is mostly only - useable for local mirrors.</para></listitem> + usable for local mirrors.</para></listitem> </varlistentry> <varlistentry><term><option>GzipIndexes</option></term> diff --git a/doc/files.dbk b/doc/files.dbk index 714255a53..95e6257e4 100644 --- a/doc/files.dbk +++ b/doc/files.dbk @@ -187,7 +187,7 @@ they apply to. The new fields are as follows: <listitem> <para> The Auto flag can be 1 (Yes) or 0 (No) and controls whether the package was -automatical installed to satisfy a dependency or if the user requested the +automatically installed to satisfy a dependency or if the user requested the installation </para> </listitem> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index be83ac8d4..90cc9a94e 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -3475,7 +3475,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -5310,7 +5310,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/po/de.po b/doc/po/de.po index be8c42e0f..37ea17305 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -4998,7 +4998,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" "Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um " "unkomprimierten Dateien einen Vorrang zu geben, beachten Sie jedoch, dass " @@ -7602,7 +7602,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/po/es.po b/doc/po/es.po index b2484f4c0..3516e1dee 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -5018,7 +5018,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" "El tipo especial <literal>uncompressed</literal> se puede utilizar para " "establecer una preferencia por los ficheros descomprimidos, pero tenga en " @@ -7530,7 +7530,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/po/fr.po b/doc/po/fr.po index 7d2805714..8d9c7dd76 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -5000,7 +5000,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" "Le type spécial <literal>uncompressed</literal> peut servir à donner la " "préférence aux fichiers non compressés. Veuillez noter que la plupart des " @@ -7578,7 +7578,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/po/it.po b/doc/po/it.po index 0cae50cb0..ff31bdffd 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -4996,7 +4996,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" "Il tipo speciale <literal>uncompressed</literal> può essere usato per dare " "la precedenza ai file non compressi, ma è bene notare che la maggior parte " @@ -7581,7 +7581,7 @@ msgstr "Formato in stile deb822" #| "entry can hence be disabled by commenting out each line belonging to the " #| "stanza, but it is usually easier to add the field \"Enabled: no\" to the " #| "stanza to disable the entry. Removing the field or setting it to yes " -#| "reenables it. Options have the same syntax as every other field: A " +#| "re-enables it. Options have the same syntax as every other field: A " #| "fieldname separated by a colon (<literal>:</literal>) and optionally " #| "spaces from its value(s). Note especially that multiple values are " #| "separated by spaces, not by commas as in the one-line format. Multivalue " @@ -7598,7 +7598,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/po/ja.po b/doc/po/ja.po index e20f0a5cd..e5e45b9b0 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -4800,7 +4800,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" "特殊なタイプ <literal>uncompressed</literal> は、非圧縮ファイルを優先するため" "に使用できますが、ほとんどのアーカイブは非圧縮ファイルを提供しないため、ほと" @@ -7273,7 +7273,7 @@ msgstr "deb822 スタイル形式" #| "entry can hence be disabled by commenting out each line belonging to the " #| "stanza, but it is usually easier to add the field \"Enabled: no\" to the " #| "stanza to disable the entry. Removing the field or setting it to yes " -#| "reenables it. Options have the same syntax as every other field: A " +#| "re-enables it. Options have the same syntax as every other field: A " #| "fieldname separated by a colon (<literal>:</literal>) and optionally " #| "spaces from its value(s). Note especially that multiple values are " #| "separated by spaces, not by commas as in the one-line format. Multivalue " @@ -7290,7 +7290,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/po/nl.po b/doc/po/nl.po index b44c66a22..b7b838881 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -5102,7 +5102,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" "Het bijzondere type <literal>uncompressed</literal> kan gebruikt worden om " "voorrang te geven aan niet-gecomprimeerde bestanden. Maar u dient te weten " @@ -7733,7 +7733,7 @@ msgstr "Indeling in deb822-stijl" #| "entry can hence be disabled by commenting out each line belonging to the " #| "stanza, but it is usually easier to add the field \"Enabled: no\" to the " #| "stanza to disable the entry. Removing the field or setting it to yes " -#| "reenables it. Options have the same syntax as every other field: A " +#| "re-enables it. Options have the same syntax as every other field: A " #| "fieldname separated by a colon (<literal>:</literal>) and optionally " #| "spaces from its value(s). Note especially that multiple values are " #| "separated by spaces, not by commas as in the one-line format. Multivalue " @@ -7750,7 +7750,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/po/pl.po b/doc/po/pl.po index b6476afcc..da06c6756 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -4723,7 +4723,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -6973,7 +6973,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/po/pt.po b/doc/po/pt.po index c5bc99888..4056ec33a 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -4953,7 +4953,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" "O tipo especial <literal>uncompressed</literal> pode ser usado para dar " "preferência a ficheiros não comprimidos, mas note que a maioria dos arquivos " @@ -7449,7 +7449,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 28544f4c5..acb3818a2 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -3428,7 +3428,7 @@ msgstr "" msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " -"uncompressed files so this is mostly only useable for local mirrors." +"uncompressed files so this is mostly only usable for local mirrors." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -5633,7 +5633,7 @@ msgid "" "the start of the line marks the entire line as a comment. An entry can hence " "be disabled by commenting out each line belonging to the stanza, but it is " "usually easier to add the field \"Enabled: no\" to the stanza to disable the " -"entry. Removing the field or setting it to yes reenables it. Options have " +"entry. Removing the field or setting it to yes re-enables it. Options have " "the same syntax as every other field: A fieldname separated by a colon " "(<literal>:</literal>) and optionally spaces from its value(s). Note " "especially that multiple values are separated by whitespaces (like spaces, " diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index ff9ac162e..84eb527e7 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -97,7 +97,7 @@ the line marks the entire line as a comment. An entry can hence be disabled by commenting out each line belonging to the stanza, but it is usually easier to add the field "Enabled: no" to the stanza to disable - the entry. Removing the field or setting it to yes reenables it. + the entry. Removing the field or setting it to yes re-enables it. Options have the same syntax as every other field: A fieldname separated by a colon (<literal>:</literal>) and optionally spaces from its value(s). diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 91cb72d01..b20331f2c 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -430,7 +430,7 @@ bool PackagesWriter::DoPackage(string FileName) string Architecture; // if we generate a Packages file for a given arch, we use it to // look for overrides. if we run in "simple" mode without the - // "Architecures" variable in the config we use the architecture value + // "Architectures" variable in the config we use the architecture value // from the deb file if(Arch != "") Architecture = Arch; diff --git a/prepare-release b/prepare-release index a37962cd7..969e9bc45 100755 --- a/prepare-release +++ b/prepare-release @@ -194,7 +194,7 @@ elif [ "$1" = 'travis-ci' ]; then gdebi -n apt-test-depends_1.0_all.deb elif [ "$1" = 'coverage' ]; then DIR="${2:-./coverage}" - git clean -dfX # remove ignored build artefacts for a clean start + git clean -dfX # remove ignored build artifacts for a clean start make CFLAGS+='--coverage' CXXFLAGS+='--coverage' LCOVRC='--rc geninfo_checksum=1 --rc lcov_branch_coverage=1' mkdir "$DIR" @@ -227,11 +227,21 @@ elif [ "$1" = 'coverage' ]; then elif [ "$1" = 'spellcheckers' ]; then echo '### codespell in source directories:' codespell --enable-colors $(find . -mindepth 1 -maxdepth 1 -type d \! -name '.git' \! -name 'doc' \! -name 'po' \! -name 'build' \! -name 'test') | \ - grep -v '^.*debian/changelog.*Troup.*==>.*Troupe.*$' || true + grep -v -e '^.*debian/changelog.*Troup.*==>.*Troupe.*$' \ + -e '^.*apt-pkg/contrib/fileutl\.cc.*creat.*==>.*create.*$' \ + -e '^.*methods/aptmethod\.h.*creat.*==>.*create.*$' \ + -e '^.*dselect/install.*ans.*==>.*and.*$' \ + || true echo '### codespell in testcases:' - codespell $(find test -type f \! -name 'status-*' \! -name 'Packages-*' \! -name '*.deb' \! -name '*.sec' \! -name '*.pub' \! -name '*.db') + codespell --enable-colors $(find test -type f \! -name 'status-*' \! -name 'Packages-*' \! -name '*.deb' \! -name '*.sec' \! -name '*.pub' \! -name '*.db') | \ + grep -v -e '^.*test/libapt/file-helpers\.cc.*creat.*==>.*create.*$' \ + -e '^.*test/libapt/tagfile_test\.cc.*tyes.*==>.*types.*$' \ + -e '^.*test/libapt/strutil_test\.cc.*Fiel.*==>.*Feel.*$' \ + -e '^.*test/integration/skip-bug-601016-description-translation.*Paket.*==>.*Packet.*$' \ + -e '^.*test/integration/skip-bug-601016-description-translation.*Wege.*==>.*Wedge.*$' \ + || true echo '### codespell in documentation:' - codespell doc/*.xml doc/*.txt doc/*.dbk doc/*.ent doc/*.cmake.in doc/xml.add doc/po4a.conf doc/examples doc/po/apt-doc.pot po/apt-all.pot README.* COPYING + codespell --enable-colors doc/*.xml doc/*.txt doc/*.dbk doc/*.ent doc/*.cmake.in doc/xml.add doc/po4a.conf doc/examples doc/po/apt-doc.pot po/apt-all.pot README.* COPYING || true echo '### spellintian in source directories:' { @@ -263,6 +273,12 @@ elif [ "$1" = 'spellcheckers' ]; then -e '^./methods/http.cc: Sz Sz (duplicate word) -> Sz$' \ -e '^./methods/ftp.cc: AFMap AFMap (duplicate word) -> AFMap$' \ -e '^./dselect/install: fi fi (duplicate word) -> fi$' \ + -e '^./CMake/Documentation.cmake: endforeach endforeach (duplicate word) -> endforeach$' \ + -e '^./apt-pkg/deb/deblistparser.cc: c c (duplicate word) -> c$' \ + -e '^./apt-private/private-install.cc: result result (duplicate word) -> result$' \ + -e '^./debian/changelog: the the (duplicate word) -> the$' \ + -e '^./debian/changelog: procceed -> proceed$' \ + -e '^./methods/aptmethod.h: QueueBack QueueBack (duplicate word) -> QueueBack$' \ || true echo '### spellintian in testcases:' spellintian $(find test -type f \! -name 'status-*' \! -name 'Packages-*' \! -name '*.deb' \! -name '*.sec' \! -name '*.pub' \! -name '*.db') \ @@ -285,7 +301,10 @@ elif [ "$1" = 'spellcheckers' ]; then -e '^test/integration/test-apt-source-and-build-dep: foo foo (duplicate word) -> foo$' \ || true echo '### spellintian in documentation:' - spellintian doc/*.xml doc/*.txt doc/*.dbk doc/*.ent doc/*.cmake.in doc/xml.add doc/po4a.conf doc/examples/* doc/po/apt-doc.pot po/apt-all.pot README.* COPYING + spellintian doc/*.xml doc/*.txt doc/*.dbk doc/*.ent doc/*.cmake.in doc/xml.add doc/po4a.conf doc/examples/* doc/po/apt-doc.pot po/apt-all.pot README.* COPYING \ + | grep -v \ + -e '^doc/examples/configure-index: https https (duplicate word) -> https$' \ + || true else echo >&1 "Usage:\t$0 pre-export diff --git a/test/integration/framework b/test/integration/framework index 38a084302..854f2c439 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -1318,7 +1318,7 @@ rewritesourceslist() { } # wait for up to 10s for a pid file to appear to avoid possible race -# when a helper is started and dosn't write the PID quick enough +# when a helper is started and doesn't write the PID quick enough waitforpidfile() { local PIDFILE="$1" for i in $(seq 10); do diff --git a/test/integration/test-bug-762160-relpath b/test/integration/test-bug-762160-relpath index 1e66fbbc3..6a800aa05 100755 --- a/test/integration/test-bug-762160-relpath +++ b/test/integration/test-bug-762160-relpath @@ -1,5 +1,5 @@ #!/bin/sh -# regresion test for bug #762160 where apt-get update fails when a +# regression test for bug #762160 where apt-get update fails when a # relative directory is given # set -e @@ -14,4 +14,4 @@ setupaptarchive changetowebserver testsuccess aptget update -o Dir=./rootdir -testsuccess aptget update -o Dir=./rootdir
\ No newline at end of file +testsuccess aptget update -o Dir=./rootdir diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc index ee469f785..012932286 100644 --- a/test/libapt/compareversion_test.cc +++ b/test/libapt/compareversion_test.cc @@ -37,19 +37,20 @@ static bool callDPKG(const char * const val, const char * const ref, char const if (Process == 0) { const char * args[] = { - BIN_DIR "/dpkg", + "dpkg", "--compare-versions", val, op, ref, nullptr }; - execv(args[0], (char**) args); + execvp(args[0], (char**) args); exit(1); } int Ret; waitpid(Process, &Ret, 0); - return WIFEXITED(Ret) == true && WEXITSTATUS(Ret) == 0; + EXPECT_TRUE(WIFEXITED(Ret)); + return WEXITSTATUS(Ret) == 0; } diff --git a/test/libapt/tagfile_test.cc b/test/libapt/tagfile_test.cc index 98af31fe9..f455a8dcc 100644 --- a/test/libapt/tagfile_test.cc +++ b/test/libapt/tagfile_test.cc @@ -235,7 +235,7 @@ TEST(TagFileTest, Comments) "Source: foo\n" "#Package: foo\n" "Section: bar\n" -"#Section: overriden\n" +"#Section: overridden\n" "Priority: optional\n" "Build-Depends: debhelper,\n" "# apt-utils, (temporarily disabled)\n" |