Browse Source

Fix various typos reported by spellcheckers

Reported-By: codespell & spellintian
Gbp-Dch: Ignore
tags/devuan/2.0.1+devuan1
David Kalnischkies 2 years ago
parent
commit
b12bdeaf8a
36 changed files with 88 additions and 68 deletions
  1. +1
    -1
      README.json-hooks.md
  2. +1
    -1
      apt-pkg/acquire-item.cc
  3. +1
    -1
      apt-pkg/acquire-worker.cc
  4. +1
    -1
      apt-pkg/algorithms.cc
  5. +1
    -1
      apt-pkg/contrib/mmap.h
  6. +2
    -2
      apt-pkg/contrib/strutl.cc
  7. +1
    -1
      apt-pkg/deb/debversion.cc
  8. +5
    -5
      apt-pkg/depcache.cc
  9. +2
    -2
      apt-pkg/depcache.h
  10. +1
    -1
      apt-pkg/indexfile.cc
  11. +1
    -1
      apt-pkg/init.cc
  12. +1
    -1
      apt-pkg/orderlist.cc
  13. +1
    -1
      apt-pkg/pkgcachegen.cc
  14. +1
    -1
      cmdline/apt-key.in
  15. +1
    -1
      debian/NEWS
  16. +7
    -7
      debian/changelog
  17. +1
    -1
      debian/libapt-inst2.0.symbols
  18. +1
    -1
      doc/apt.conf.5.xml
  19. +1
    -1
      doc/files.dbk
  20. +2
    -2
      doc/po/apt-doc.pot
  21. +2
    -2
      doc/po/de.po
  22. +2
    -2
      doc/po/es.po
  23. +2
    -2
      doc/po/fr.po
  24. +3
    -3
      doc/po/it.po
  25. +3
    -3
      doc/po/ja.po
  26. +3
    -3
      doc/po/nl.po
  27. +2
    -2
      doc/po/pl.po
  28. +2
    -2
      doc/po/pt.po
  29. +2
    -2
      doc/po/pt_BR.po
  30. +1
    -1
      doc/sources.list.5.xml
  31. +1
    -1
      ftparchive/writer.cc
  32. +24
    -5
      prepare-release
  33. +1
    -1
      test/integration/framework
  34. +2
    -2
      test/integration/test-bug-762160-relpath
  35. +4
    -3
      test/libapt/compareversion_test.cc
  36. +1
    -1
      test/libapt/tagfile_test.cc

+ 1
- 1
README.json-hooks.md View File

@@ -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


+ 1
- 1
apt-pkg/acquire-item.cc View File

@@ -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)


+ 1
- 1
apt-pkg/acquire-worker.cc View File

@@ -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);


+ 1
- 1
apt-pkg/algorithms.cc View File

@@ -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)


+ 1
- 1
apt-pkg/contrib/mmap.h View File

@@ -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;


+ 2
- 2
apt-pkg/contrib/strutl.cc View File

@@ -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();


+ 1
- 1
apt-pkg/deb/debversion.cc View File

@@ -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,


+ 5
- 5
apt-pkg/depcache.cc View File

@@ -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)
{


+ 2
- 2
apt-pkg/depcache.h View File

@@ -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();



+ 1
- 1
apt-pkg/indexfile.cc View File

@@ -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.
##################################################################### */
/*}}}*/


+ 1
- 1
apt-pkg/init.cc View File

@@ -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


+ 1
- 1
apt-pkg/orderlist.cc View File

@@ -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)


+ 1
- 1
apt-pkg/pkgcachegen.cc View File

@@ -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)


+ 1
- 1
cmdline/apt-key.in View File

@@ -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


+ 1
- 1
debian/NEWS View File

@@ -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


+ 7
- 7
debian/changelog View File

@@ -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.


+ 1
- 1
debian/libapt-inst2.0.symbols View File

@@ -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


+ 1
- 1
doc/apt.conf.5.xml View File

@@ -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>


+ 1
- 1
doc/files.dbk View File

@@ -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>


+ 2
- 2
doc/po/apt-doc.pot View File

@@ -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, "


+ 2
- 2
doc/po/de.po View File

@@ -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, "


+ 2
- 2
doc/po/es.po View File

@@ -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, "


+ 2
- 2
doc/po/fr.po View File

@@ -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, "


+ 3
- 3
doc/po/it.po View File

@@ -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, "


+ 3
- 3
doc/po/ja.po View File

@@ -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, "


+ 3
- 3
doc/po/nl.po View File

@@ -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, "


+ 2
- 2
doc/po/pl.po View File

@@ -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, "


+ 2
- 2
doc/po/pt.po View File

@@ -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, "


+ 2
- 2
doc/po/pt_BR.po View File

@@ -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, "


+ 1
- 1
doc/sources.list.5.xml View File

@@ -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).


+ 1
- 1
ftparchive/writer.cc View File

@@ -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;


+ 24
- 5
prepare-release View File

@@ -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


+ 1
- 1
test/integration/framework View File

@@ -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


+ 2
- 2
test/integration/test-bug-762160-relpath View File

@@ -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
testsuccess aptget update -o Dir=./rootdir

+ 4
- 3
test/libapt/compareversion_test.cc View File

@@ -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;
}




+ 1
- 1
test/libapt/tagfile_test.cc View File

@@ -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"


Loading…
Cancel
Save