Browse Source

fix various typos reported by spellintian

Most of them in (old) code comments. The two instances of user visible
string changes the po files of the manpages are fixed up as well.

Gbp-Dch: Ignore
Reported-By: spellintian
tags/devuan/2.0.1+devuan1
David Kalnischkies 3 years ago
parent
commit
93cff633a8
77 changed files with 151 additions and 150 deletions
  1. +1
    -1
      CMake/Misc.cmake
  2. +3
    -3
      README.progress-reporting
  3. +1
    -1
      apt-inst/extract.cc
  4. +1
    -1
      apt-inst/filelist.cc
  5. +1
    -1
      apt-inst/filelist.h
  6. +2
    -2
      apt-pkg/acquire-item.cc
  7. +1
    -1
      apt-pkg/acquire-item.h
  8. +1
    -1
      apt-pkg/acquire-method.cc
  9. +5
    -5
      apt-pkg/acquire.h
  10. +3
    -3
      apt-pkg/algorithms.cc
  11. +2
    -2
      apt-pkg/cacheset.cc
  12. +2
    -2
      apt-pkg/cacheset.h
  13. +1
    -1
      apt-pkg/cdrom.cc
  14. +1
    -1
      apt-pkg/contrib/configuration.cc
  15. +1
    -1
      apt-pkg/contrib/error.h
  16. +1
    -1
      apt-pkg/contrib/gpgv.cc
  17. +3
    -3
      apt-pkg/contrib/mmap.cc
  18. +1
    -1
      apt-pkg/contrib/mmap.h
  19. +1
    -1
      apt-pkg/contrib/proxy.cc
  20. +3
    -3
      apt-pkg/contrib/strutl.cc
  21. +2
    -2
      apt-pkg/deb/debrecords.h
  22. +3
    -3
      apt-pkg/deb/dpkgpm.cc
  23. +3
    -3
      apt-pkg/depcache.cc
  24. +1
    -1
      apt-pkg/depcache.h
  25. +1
    -1
      apt-pkg/edsp.h
  26. +1
    -1
      apt-pkg/indexfile.h
  27. +4
    -4
      apt-pkg/orderlist.cc
  28. +3
    -3
      apt-pkg/packagemanager.cc
  29. +1
    -1
      apt-pkg/packagemanager.h
  30. +2
    -2
      apt-pkg/pkgcache.cc
  31. +1
    -1
      apt-pkg/pkgrecords.h
  32. +1
    -1
      apt-pkg/policy.h
  33. +1
    -1
      apt-pkg/tagfile.cc
  34. +1
    -1
      apt-pkg/tagfile.h
  35. +2
    -2
      apt-pkg/update.h
  36. +1
    -1
      apt-pkg/upgrade.cc
  37. +2
    -2
      apt-pkg/upgrade.h
  38. +3
    -3
      apt-private/private-output.cc
  39. +1
    -1
      apt-private/private-source.cc
  40. +1
    -1
      debian/apt.postinst
  41. +22
    -22
      debian/changelog
  42. +3
    -3
      doc/acquire-additional-files.txt
  43. +1
    -1
      doc/apt-key.8.xml
  44. +1
    -1
      doc/apt-verbatim.ent
  45. +1
    -1
      doc/dpkg-tech.dbk
  46. +1
    -1
      doc/examples/apt-https-method-example.conf
  47. +2
    -2
      doc/examples/configure-index
  48. +2
    -2
      doc/external-dependency-solver-protocol.txt
  49. +1
    -1
      doc/guide.dbk
  50. +5
    -4
      doc/libapt-pkg2_to_3.txt
  51. +1
    -1
      doc/method.dbk
  52. +2
    -2
      doc/po/apt-doc.pot
  53. +2
    -2
      doc/po/de.po
  54. +2
    -2
      doc/po/es.po
  55. +2
    -2
      doc/po/fr.po
  56. +3
    -3
      doc/po/it.po
  57. +2
    -2
      doc/po/ja.po
  58. +2
    -2
      doc/po/nl.po
  59. +2
    -2
      doc/po/pl.po
  60. +2
    -2
      doc/po/pt.po
  61. +2
    -2
      doc/po/pt_BR.po
  62. +1
    -1
      doc/style.txt
  63. +1
    -1
      ftparchive/contents.cc
  64. +2
    -2
      ftparchive/writer.cc
  65. +2
    -2
      methods/basehttp.cc
  66. +2
    -2
      methods/ftp.cc
  67. +1
    -1
      methods/gpgv.cc
  68. +1
    -1
      test/integration/framework
  69. +1
    -1
      test/integration/test-apt-ftparchive-by-hash
  70. +1
    -1
      test/integration/test-apt-ftparchive-cachedb
  71. +1
    -1
      test/integration/test-apt-ftparchive-cachedb-lp1274466
  72. +1
    -1
      test/integration/test-apt-source-and-build-dep
  73. +2
    -2
      test/integration/test-bug-770291-reinstall
  74. +1
    -1
      test/integration/test-pdiff-usage
  75. +1
    -1
      test/integration/test-releasefile-valid-until
  76. +1
    -1
      test/integration/test-releasefile-verification
  77. +1
    -1
      triehash/triehash.pl

+ 1
- 1
CMake/Misc.cmake View File

@@ -45,7 +45,7 @@ function(add_vendor_file)
VERBATIM
)

# Woud like to use ${AVF_OUTPUT} as target name, but then ninja gets
# Would like to use ${AVF_OUTPUT} as target name, but then ninja gets
# cycles.
add_custom_target(vendor-${AVF_OUTPUT} ALL DEPENDS ${out})
endfunction()


+ 3
- 3
README.progress-reporting View File

@@ -23,7 +23,7 @@ pmstatus:pkgname:TotalPercentage:action-description

PkgName = the name of the package
TotalPercentage = the total progress between [0..100]
description = a i18ned human readable decription of the current action
description = a i18ned human readable description of the current action


Example:
@@ -61,9 +61,9 @@ dlstatus:AlreadDownloaded:TotalPercentage:action-description

AlreadyDownloaded = the number of already downloaded packages
TotalPercentage = the total progress between [0..100]
description = a i18ned human readable decription of the current action
description = a i18ned human readable description of the current action

Example:
dlstatus:1:9.05654:Downloading file 1 of 3 (4m40s remaining)
dlstatus:1:9.46357:Downloading file 1 of 3 (4m39s remaining)
dlstatus:1:9.61022:Downloading file 1 of 3 (4m38s remaining)
dlstatus:1:9.61022:Downloading file 1 of 3 (4m38s remaining)

+ 1
- 1
apt-inst/extract.cc View File

@@ -37,7 +37,7 @@
is invoked.
As we unpack we record the file list differences in the FL cache. If
we need to unroll the the FL cache knows which files have been unpacked
we need to unroll the FL cache knows which files have been unpacked
and can undo. When we need to erase then it knows which files have not
been unpacked.


+ 1
- 1
apt-inst/filelist.cc View File

@@ -195,7 +195,7 @@ map_ptrloc pkgFLCache::TreeLookup(map_ptrloc *Base,const char *Text,
/*}}}*/
// FLCache::PrintTree - Print out a tree /*{{{*/
// ---------------------------------------------------------------------
/* This is a simple generic tree dumper, ment for debugging. */
/* This is a simple generic tree dumper, meant for debugging. */
void pkgFLCache::PrintTree(map_ptrloc Base,unsigned long Size)
{
if (Base == 0)


+ 1
- 1
apt-inst/filelist.h View File

@@ -12,7 +12,7 @@
The storage content of the class is maintained in a memory map and is
written directly to the file system. Performance is traded against
space to give something that performs well and remains small.
The average per file usage is 32 bytes which yeilds about a meg every
The average per file usage is 32 bytes which yields about a meg every
36k files. Directory paths are collected into a binary tree and stored
only once, this offsets the cost of the hash nodes enough to keep
memory usage slightly less than the sum of the filenames.


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

@@ -1907,7 +1907,7 @@ void pkgAcqMetaSig::Done(string const &Message, HashStringList const &Hashes,
{
auto const Releasegpg = GetFinalFilename();
auto const Release = MetaIndex->GetFinalFilename();
// if this is an IMS-Hit on Release ensure we also have the the Release.gpg file stored
// if this is an IMS-Hit on Release ensure we also have the Release.gpg file stored
// (previously an unknown pubkey) – but only if the Release file exists locally (unlikely
// event of InRelease removed from the mirror causing fallback but still an IMS-Hit)
if (TransactionManager->IMSHit == false ||
@@ -2892,7 +2892,7 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
<< TransactionManager << std::endl;
}
/*}}}*/
// AcqIndex::Init - defered Constructor /*{{{*/
// AcqIndex::Init - deferred Constructor /*{{{*/
static void NextCompressionExtension(std::string &CurrentCompressionExtension, std::string &CompressionExtensions, bool const preview)
{
size_t const nextExt = CompressionExtensions.find(' ');


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

@@ -114,7 +114,7 @@ class pkgAcquire::Item : public WeakPointable /*{{{*/

/** \brief A client-supplied unique identifier.
*
* This field is initalized to 0; it is meant to be filled in by
* This field is initialized to 0; it is meant to be filled in by
* clients that wish to use it to uniquely identify items.
*
* APT progress reporting will store an ID there as shown in "Get:42 …"


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

@@ -239,7 +239,7 @@ void pkgAcqMethod::URIDone(FetchResult &Res, FetchResult *Alt)
Dequeue();
}
/*}}}*/
// AcqMethod::MediaFail - Syncronous request for new media /*{{{*/
// AcqMethod::MediaFail - Synchronous request for new media /*{{{*/
// ---------------------------------------------------------------------
/* This sends a 403 Media Failure message to the APT and waits for it
to be ackd */


+ 5
- 5
apt-pkg/acquire.h View File

@@ -10,11 +10,11 @@
Each file to download is represented by an Acquire::Item class subclassed
into a specialization. The Item class can add itself to several URI
acquire queues each prioritized by the download scheduler. When the
system is run the proper URI handlers are spawned and the the acquire
acquire queues each prioritized by the download scheduler. When the
system is run the proper URI handlers are spawned and the acquire
queues are fed into the handlers by the schedular until the queues are
empty. This allows for an Item to be downloaded from an alternate source
if the first try turns out to fail. It also alows concurrent downloading
if the first try turns out to fail. It also allows concurrent downloading
of multiple items from multiple sources as well as dynamic balancing
of load between the sources.
@@ -241,7 +241,7 @@ class pkgAcquire
*/
bool RunFdsSane(fd_set *RSet,fd_set *WSet);

// just here for compatbility, needs to be removed on the next
// just here for compatibility, needs to be removed on the next
// ABI/API break. RunFdsSane() is what should be used as it
// returns if there is an error condition on one of the fds
virtual void RunFds(fd_set *RSet,fd_set *WSet);
@@ -395,7 +395,7 @@ class pkgAcquire
/** \brief Represents a single download source from which an item
* should be downloaded.
*
* An item may have several assocated ItemDescs over its lifetime.
* An item may have several associated ItemDescs over its lifetime.
*/
struct pkgAcquire::ItemDesc : public WeakPointable
{


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

@@ -1051,7 +1051,7 @@ bool pkgProblemResolver::ResolveInternal(bool const BrokenFix)
}
}

// Hm, nothing can possibly satisify this dep. Nuke it.
// Hm, nothing can possibly satisfy this dep. Nuke it.
if (VList[0] == 0 &&
Start.IsNegative() == false &&
(Flags[I->ID] & Protected) != Protected)
@@ -1283,7 +1283,7 @@ bool pkgProblemResolver::ResolveByKeepInternal()
continue;

/* Hm, the group is broken.. I suppose the best thing to do is to
is to try every combination of keep/not-keep for the set, but thats
is to try every combination of keep/not-keep for the set, but that's
slow, and this never happens, just be conservative and assume the
list of ors is in preference and keep till it starts to work. */
while (true)
@@ -1373,7 +1373,7 @@ void pkgProblemResolver::InstallProtect()
/*}}}*/
// PrioSortList - Sort a list of versions by priority /*{{{*/
// ---------------------------------------------------------------------
/* This is ment to be used in conjunction with AllTargets to get a list
/* This is meant to be used in conjunction with AllTargets to get a list
of versions ordered by preference. */

struct PrioComp {


+ 2
- 2
apt-pkg/cacheset.cc View File

@@ -858,7 +858,7 @@ APT_IGNORE_DEPRECATED_PUSH
case TASK: showTaskSelection(pkg, pattern); break;
case FNMATCH: showFnmatchSelection(pkg, pattern); break;
APT_IGNORE_DEPRECATED_POP
case PACKAGENAME: /* no suprises here */ break;
case PACKAGENAME: /* no surprises here */ break;
case STRING: /* handled by the special cases */ break;
case UNKNOWN: break;
}
@@ -898,7 +898,7 @@ APT_IGNORE_DEPRECATED_POP
case INSTCAND:
case ALL:
case CANDANDINST:
// not really suprises, but in fact: just not implemented
// not really surprises, but in fact: just not implemented
break;
}
}


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

@@ -465,7 +465,7 @@ APT_IGNORE_DEPRECATED_POP
/** \brief returns all packages in the cache who belong to the given task

A simple helper responsible for search for all members of a task
in the cache. Optional it prints a a notice about the
in the cache. Optional it prints a notice about the
packages chosen cause of the given task.
\param Cache the packages are in
\param pattern name of the task
@@ -483,7 +483,7 @@ APT_IGNORE_DEPRECATED_POP
/** \brief returns all packages in the cache whose name matchs a given pattern

A simple helper responsible for executing a regular expression on all
package names in the cache. Optional it prints a a notice about the
package names in the cache. Optional it prints a notice about the
packages chosen cause of the given package.
\param Cache the packages are in
\param pattern regular expression for package names


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

@@ -67,7 +67,7 @@ bool pkgCdrom::FindPackages(string CD,
InfoDir = InfoDir + CD + ".disk/";
}

// Don't look into directories that have been marked to ingore.
// Don't look into directories that have been marked to ignore.
if (RealFileExists(".aptignr") == true)
return true;



+ 1
- 1
apt-pkg/contrib/configuration.cc View File

@@ -1043,7 +1043,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio
{
Stack.push(ParentTag);

/* Make sectional tags incorperate the section into the
/* Make sectional tags incorporate the section into the
tag string */
if (AsSectional == true && Word.empty() == false)
{


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

@@ -3,7 +3,7 @@
// $Id: error.h,v 1.8 2001/05/07 05:06:52 jgg Exp $
/* ######################################################################
Global Erorr Class - Global error mechanism
Global Error Class - Global error mechanism

This class has a single global instance. When a function needs to
generate an error condition, such as a read error, it calls a member


+ 1
- 1
apt-pkg/contrib/gpgv.cc View File

@@ -431,7 +431,7 @@ bool OpenMaybeClearSignedFile(std::string const &ClearSignedFileName, FileFd &Me
free(message);
return _error->Errno("mkstemp", "Couldn't create temporary file to work with %s", ClearSignedFileName.c_str());
}
// we have the fd, thats enough for us
// we have the fd, that's enough for us
unlink(message);
free(message);



+ 3
- 3
apt-pkg/contrib/mmap.cc View File

@@ -156,9 +156,9 @@ bool MMap::Close(bool DoSync)
return true;
}
/*}}}*/
// MMap::Sync - Syncronize the map with the disk /*{{{*/
// MMap::Sync - Synchronize the map with the disk /*{{{*/
// ---------------------------------------------------------------------
/* This is done in syncronous mode - the docs indicate that this will
/* This is done in synchronous mode - the docs indicate that this will
not return till all IO is complete */
bool MMap::Sync()
{
@@ -183,7 +183,7 @@ bool MMap::Sync()
return true;
}
/*}}}*/
// MMap::Sync - Syncronize a section of the file to disk /*{{{*/
// MMap::Sync - Synchronize a section of the file to disk /*{{{*/
// ---------------------------------------------------------------------
/* */
bool MMap::Sync(unsigned long Start,unsigned long Stop)


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

@@ -10,7 +10,7 @@
from file fd's this function will use read and normal allocated
memory.
Writing to a public mmap will always fully comit all changes when the
Writing to a public mmap will always fully commit all changes when the
class is deleted. Ie it will rewrite the file, unless it is readonly

The DynamicMMap class is used to help the on-disk data structure


+ 1
- 1
apt-pkg/contrib/proxy.cc View File

@@ -2,7 +2,7 @@
// Description /*{{{*/
/* ######################################################################
Proxy - Proxy releated functions
Proxy - Proxy related functions
##################################################################### */
/*}}}*/


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

@@ -760,7 +760,7 @@ int StringToBool(const string &Text,int Default)
// TimeRFC1123 - Convert a time_t into RFC1123 format /*{{{*/
// ---------------------------------------------------------------------
/* This converts a time_t into a string time representation that is
year 2000 complient and timezone neutral */
year 2000 compliant and timezone neutral */
string TimeRFC1123(time_t Date)
{
return TimeRFC1123(Date, false);
@@ -1478,7 +1478,7 @@ string StripEpoch(const string &VerStr)
// tolower_ascii - tolower() function that ignores the locale /*{{{*/
// ---------------------------------------------------------------------
/* This little function is the most called method we have and tries
therefore to do the absolut minimum - and is notable faster than
therefore to do the absolute minimum - and is notable faster than
standard tolower/toupper and as a bonus avoids problems with different
locales - we only operate on ascii chars anyway. */
#undef tolower_ascii
@@ -1492,7 +1492,7 @@ int tolower_ascii(int const c)
// isspace_ascii - isspace() function that ignores the locale /*{{{*/
// ---------------------------------------------------------------------
/* This little function is one of the most called methods we have and tries
therefore to do the absolut minimum - and is notable faster than
therefore to do the absolute minimum - and is notable faster than
standard isspace() and as a bonus avoids problems with different
locales - we only operate on ascii chars anyway. */
#undef isspace_ascii


+ 2
- 2
apt-pkg/deb/debrecords.h View File

@@ -5,8 +5,8 @@
Debian Package Records - Parser for debian package records
This provides display-type parsing for the Packages file. This is
different than the the list parser which provides cache generation
This provides display-type parsing for the Packages file. This is
different than the list parser which provides cache generation
services. There should be no overlap between these two.
##################################################################### */


+ 3
- 3
apt-pkg/deb/dpkgpm.cc View File

@@ -1446,7 +1446,7 @@ bool pkgDPkgPM::ExpandPendingCalls(std::vector<Item> &List, pkgDepCache &Cache)
}
bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
{
// explicitely remove&configure everything for hookscripts and progress building
// explicitly remove&configure everything for hookscripts and progress building
// we need them only temporarily through, so keep the length and erase afterwards
decltype(List)::const_iterator::difference_type explicitIdx =
std::distance(List.cbegin(), List.cend());
@@ -1909,7 +1909,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
ADDARG(fullname);
}
}
// skip configure action if all sheduled packages disappeared
// skip configure action if all scheduled packages disappeared
if (oldSize == Size)
continue;
}
@@ -2101,7 +2101,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)

if (d->dpkg_error.empty() == false)
{
// no point in reseting packages we already completed removal for
// no point in resetting packages we already completed removal for
StripAlreadyDoneFrom(approvedStates.Remove());
StripAlreadyDoneFrom(approvedStates.Purge());
APT::StateChanges undo;


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

@@ -787,7 +787,7 @@ bool pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser,

ActionGroup group(*this);

#if 0 // reseting the autoflag here means we lose the
#if 0 // resetting the autoflag here means we lose the
// auto-mark information if a user selects a package for removal
// but changes his mind then and sets it for keep again
// - this makes sense as default when all Garbage dependencies
@@ -1079,7 +1079,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,

StateCache &P = PkgState[Pkg->ID];

// See if there is even any possible instalation candidate
// See if there is even any possible installation candidate
if (P.CandidateVer == 0)
return false;

@@ -1781,7 +1781,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator const &Dep) const
{
if (InstallRecommends)
return true;
// we suport a special mode to only install-recommends for certain
// we support a special mode to only install-recommends for certain
// sections
// FIXME: this is a meant as a temporarly solution until the
// recommends are cleaned up


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

@@ -21,7 +21,7 @@
3 dependency results.
Now - Compared using the Currently install version
Install - Compared using the install version (final state)
CVer - (Candidate Verion) Compared using the Candidate Version
CVer - (Candidate Version) Compared using the Candidate Version
The candidate and now results are used to decide wheather a package
should be automatically installed or if it should be left alone.


+ 1
- 1
apt-pkg/edsp.h View File

@@ -133,7 +133,7 @@ namespace EDSP /*{{{*/
* \param[out] remove is a list which gets populated with requested removals
* \param[out] upgrade is true if it is a request like apt-get upgrade
* \param[out] distUpgrade is true if it is a request like apt-get dist-upgrade
* \param[out] autoRemove is true if removal of uneeded packages should be performed
* \param[out] autoRemove is true if removal of unneeded packages should be performed
*
* \return true if the request could be found and worked on, otherwise false
*/


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

@@ -155,7 +155,7 @@ class pkgIndexFile
rather bad (doesn't take three character like ast into account).*/
APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static bool CheckLanguageCode(const char * const Lang);
/* As we have now possibly more than one LanguageCode this method is
superseeded by a) private classmembers or b) getLanguages() */
superseded by a) private classmembers or b) getLanguages() */
APT_DEPRECATED_MSG("These methods make no sense anymore with multi-language support") static std::string LanguageCode();

bool IsTrusted() const { return Trusted; };


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

@@ -57,7 +57,7 @@
There are complications in this algorithm when presented with cycles.
For all known practical cases it works, all cases where it doesn't work
is fixable by tweaking the package descriptions. However, it should be
possible to impove this further to make some better choices when
possible to improve this further to make some better choices when
presented with cycles.
##################################################################### */
@@ -134,7 +134,7 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg)
/*}}}*/
// OrderList::DoRun - Does an order run /*{{{*/
// ---------------------------------------------------------------------
/* The caller is expeted to have setup the desired probe state */
/* The caller is expected to have setup the desired probe state */
bool pkgOrderList::DoRun()
{
// Temp list
@@ -587,7 +587,7 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from)

DepFunc Old = Primary;
// Perform immedate configuration of the package if so flagged.
// Perform immediate configuration of the package if so flagged.
if (IsFlag(Pkg,Immediate) == true && Primary != &pkgOrderList::DepUnPackPre)
Primary = &pkgOrderList::DepUnPackPreD;

@@ -875,7 +875,7 @@ bool pkgOrderList::DepUnPackDep(DepIterator D)
orders configuration so that when a package comes to be configured it's
dependents are configured.
Loops are ingored. Depends loop entry points are chaotic. */
Loops are ignored. Depends loop entry points are chaotic. */
bool pkgOrderList::DepConfigure(DepIterator D)
{
// Never consider reverse configuration dependencies.


+ 3
- 3
apt-pkg/packagemanager.cc View File

@@ -135,7 +135,7 @@ bool pkgPackageManager::FixMissing()
return Resolve.ResolveByKeep() == true && Cache.BrokenCount() == 0;
}
/*}}}*/
// PM::ImmediateAdd - Add the immediate flag recursivly /*{{{*/
// PM::ImmediateAdd - Add the immediate flag recursively /*{{{*/
// ---------------------------------------------------------------------
/* This adds the immediate flag to the pkg and recursively to the
dependencies
@@ -806,7 +806,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
break;
}

// check if it needs unpack or if if configure is enough
// check if it needs unpack or if configure is enough
if (List->IsFlag(DepPkg,pkgOrderList::UnPacked) == false)
{
// two packages pre-depending on each other can't be handled sanely
@@ -1015,7 +1015,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
return false;

if (Immediate == true) {
// Perform immedate configuration of the package.
// Perform immediate configuration of the package.
if (SmartConfigure(Pkg, Depth + 1) == false)
_error->Error(_("Could not perform immediate configuration on '%s'. "
"Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.FullName().c_str(),2);


+ 1
- 1
apt-pkg/packagemanager.h View File

@@ -7,7 +7,7 @@
Three steps are
- Aquiration of archives (stores the list of final file names)
- Sorting of operations
- Invokation of package manager
- Invocation of package manager
This is the final stage when the package cache entities get converted
into file names and the state stored in a DepCache is transformed


+ 2
- 2
apt-pkg/pkgcache.cc View File

@@ -612,8 +612,8 @@ bool pkgCache::DepIterator::IsNegative() const
/* This intellegently looks at dep target packages and tries to figure
out which package should be used. This is needed to nicely handle
provide mapping. If the target package has no other providing packages
then it returned. Otherwise the providing list is looked at to
see if there is one one unique providing package if so it is returned.
then it returned. Otherwise the providing list is looked at to
see if there is one unique providing package if so it is returned.
Otherwise true is returned and the target package is set. The return
result indicates whether the node should be expandable


+ 1
- 1
apt-pkg/pkgrecords.h View File

@@ -10,7 +10,7 @@
package files. This is different than the generators parser in that
it is used to access information not generate information. No
information touched by the generator should be parable from here as
it can always be retreived directly from the cache.
it can always be retrieved directly from the cache.
##################################################################### */
/*}}}*/


+ 1
- 1
apt-pkg/policy.h View File

@@ -8,7 +8,7 @@
standard 'Version 0' engine is included inside the DepCache which is
it's historical location.
The V4 engine allows the user to completly control all aspects of
The V4 engine allows the user to completely control all aspects of
version selection. There are three primary means to choose a version
* Selection by version match
* Selection by Release file match


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

@@ -1092,7 +1092,7 @@ bool TFRewrite(FILE *Output,pkgTagSection const &Tags,const char *Order[],
Rewrite[J].NewTag = Rewrite[J].Tag;
}
// Write all all of the tags, in order.
// Write all of the tags, in order.
if (Order != NULL)
{
for (unsigned int I = 0; Order[I] != 0; I++)


+ 1
- 1
apt-pkg/tagfile.h View File

@@ -146,7 +146,7 @@ class pkgTagSection

/** \brief amount of Tags in the current section
*
* Note: if a Tag is mentioned repeatly it will be counted multiple
* Note: if a Tag is mentioned repeatedly it will be counted multiple
* times, but only the last occurrence is available via Find methods.
*/
unsigned int Count() const;


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

@@ -2,8 +2,8 @@
// Description /*{{{*/
/* ######################################################################

Update - ListUpdate releated code
Update - ListUpdate related code
##################################################################### */
/*}}}*/



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

@@ -210,7 +210,7 @@ static bool pkgAllUpgradeWithNewPackages(pkgDepCache &Cache, OpProgress * const
if (Progress != NULL)
Progress->Progress(50);

// ... but it may remove stuff, we we need to clean up afterwards again
// ... but it may remove stuff, we need to clean up afterwards again
for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; ++I)
if (Cache[I].Delete() == true)
Cache.MarkKeep(I, false, false);


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

@@ -2,8 +2,8 @@
// Description /*{{{*/
/* ######################################################################

Upgrade - Upgrade/DistUpgrade releated code
Upgrade - Upgrade/DistUpgrade related code
##################################################################### */
/*}}}*/



+ 3
- 3
apt-private/private-output.cc View File

@@ -304,14 +304,14 @@ void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records, /*{{{*/
// ShowBroken - Debugging aide /*{{{*/
// ---------------------------------------------------------------------
/* This prints out the names of all the packages that are broken along
with the name of each each broken dependency and a quite version
with the name of each broken dependency and a quite version
description.
The output looks like:
The following packages have unmet dependencies:
exim: Depends: libc6 (>= 2.1.94) but 2.1.3-10 is to be installed
Depends: libldap2 (>= 2.0.2-2) but it is not going to be installed
Depends: libsasl7 but it is not going to be installed
Depends: libsasl7 but it is not going to be installed
*/
static void ShowBrokenPackage(ostream &out, pkgCacheFile * const Cache, pkgCache::PkgIterator const &Pkg, bool const Now)
{


+ 1
- 1
apt-private/private-source.cc View File

@@ -306,7 +306,7 @@ static pkgSrcRecords::Parser *FindSrc(const char *Name,
/*}}}*/
// DoSource - Fetch a source archive /*{{{*/
// ---------------------------------------------------------------------
/* Fetch souce packages */
/* Fetch source packages */
struct DscFile
{
std::string Package;


+ 1
- 1
debian/apt.postinst View File

@@ -54,7 +54,7 @@ case "$1" in
chown -R root:root /var/lib/apt/lists /var/cache/apt/archives || true
fi

# ensure tighter permissons on the logs, see LP: #975199
# ensure tighter permissions on the logs, see LP: #975199
if dpkg --compare-versions "$2" lt-nl 0.9.7.7; then
# ensure permissions are right
chmod -f 0640 /var/log/apt/term.log* || true


+ 22
- 22
debian/changelog View File

@@ -1464,7 +1464,7 @@ apt (1.1~exp9) experimental; urgency=medium
* Make auto-remove and auto-clean aliases for the versions without -
(Closes: #274159)
* apt: Add autoremove and auto-remove commands
* changelog: Replace spelling reenable by re-enable everywhere.
* changelog: Replace spelling typo for re-enable everywhere.
Thanks to Lintian
* debian/control: Replace debian by Debian.
Thanks to Lintian
@@ -1607,7 +1607,7 @@ apt (1.1~exp4) experimental; urgency=medium
Do not download more data in the mehotds than expected if we know
the size. For the InRelease/Release/Release.gpg add new
Acquire::MaxReleaseFileSize that defaults to 10Mb for now
* Verify the the hashes of the downloaded compressed files early
* Verify the hashes of the downloaded compressed files early
* Only load unauthenticated data into our parsers when the user
explicitly asked for it via --allow-insecure-repositories
(Acquire::AllowInsecureRepositories)
@@ -1638,7 +1638,7 @@ apt (1.1~exp4) experimental; urgency=medium
(Closes: 733028)
* use apt-key adv (+ gnupg) instead of gpgv for verify
* support gnupg2 as drop-in replacement for gnupg
* allow to specify fingerprints in 'apt-key del'
* allows one to specify fingerprints in 'apt-key del'
* use only one --keyring in gpg interactions
* add and use 'apt-key verify' which prefers gpgv over gpg
* remove empty keyrings in trusted.gpg.d on upgrade
@@ -2668,7 +2668,7 @@ apt (0.9.13~exp1) experimental; urgency=low

* Improve the API for APT::Upgrade::Upgrade()
* Re-add "Calculating upgrade..." message
* move upgrade releated code into upgrade.{cc,h}
* move upgrade related code into upgrade.{cc,h}
* Move ListUpdate/AcquireUpdate into update.{cc,h}
* Add new apt-pkg/install-progress.h with APT::Progress::PackageManager
progress reporting classes
@@ -2889,7 +2889,7 @@ apt (0.9.10) unstable; urgency=low
* exclude config.{sub,guess} from source package
* update the symbol files to reflect current state
* unset LANGUAGE for showing [Y/n] answer hints
* fix some unitialized data members
* fix some uninitialized data members
* specific pins below 1000 cause downgrades (Closes: 543966)
* use pkgTagFile to parse "header" of Release files
* fix: --print-uris removes authentication (Closes: 719263)
@@ -3051,7 +3051,7 @@ apt (0.9.8.1) unstable; urgency=low
[ Michael Vogt ]
* moved source to http://git.debian.org/apt/apt.git
* updated gbp.conf to match what bzr-buildpackage is doing
* remove .bzr-buildpackage/default.conf (superseeded by gbp.conf)
* remove .bzr-buildpackage/default.conf (superseded by gbp.conf)

-- Michael Vogt <mvo@debian.org> Thu, 16 May 2013 14:50:43 +0200

@@ -4169,7 +4169,7 @@ apt (0.8.16~exp8) experimental; urgency=low
- show a debug why a package was kept by ResolveByKeep()
* apt-pkg/packagemanager.cc:
- do not fail on unpacked packages in SmartUnPack, just don't
shedule them for unpack, but do all checks and configure them
schedule them for unpack, but do all checks and configure them
- do not enter an endless loop for (essential) pre-dependency loops
* apt-pkg/contrib/sha2_internal.cc:
- use a pointer-union to peace gcc strict-aliasing warning
@@ -5037,9 +5037,9 @@ apt (0.8.12) unstable; urgency=low
- honor Dpkg::Chroot-Directory in the RunScripts*() methods
* apt-pkg/contrib/cdromutl.{cc,h}, apt-pkg/cdrom.{cc,h}:
- deal with missing FSTAB_DIR when using libudev to discover cdrom
- add experimental APT::cdrom::CdromOnly option (on by default).
- add experimental APT::cdrom::CdromOnly option (on by default).
When this is set to false apt-cdrom will handle any removable
deivce (like a usb-stick) as a "cdrom/dvd" source
device (like a usb-stick) as a "cdrom/dvd" source

[ Christian Perrier ]
* Fix error in French translation of manpages (apt_preferences(5)).
@@ -5462,7 +5462,7 @@ apt (0.8.5) unstable; urgency=low
* apt-pkg/deb/deblistparser.cc:
- overrule NotAutomatic in case of ButAutomaticUpgrades
* debian/apt.cron.daily:
- handle absolut directory paths correctly by loading directories
- handle absolute directory paths correctly by loading directories
directly instead of building the paths on our own (Closes: #596421)
* debian/control:
- build-depend on docbook-xml to ensure that the xml DTDs are always
@@ -5714,7 +5714,7 @@ apt (0.7.26~exp11) experimental; urgency=low
- handle "circular" conflicts for "all" packages correctly
* cmdline/apt-cache.cc:
- be able to omit dependency types in (r)depends (Closes: #319006)
- show in (r)depends the canidate per default instead of newest
- show in (r)depends the candidate per default instead of newest
- share the (r)depends code instead of codecopy
* apt-pkg/cacheset.cc:
- move them back to the library as they look stable now
@@ -5834,7 +5834,7 @@ apt (0.7.26~exp8) experimental; urgency=low
- add another round of const& madness as the previous round accidentally
NOT overrides the virtual GetCandidateVer() method (Closes: #587725)
* apt-pkg/pkgcachegen.{cc,h}:
- make the used MMap moveable (and therefore dynamic resizeable) by
- make the used MMap moveable (and therefore dynamic resizable) by
applying (some) mad pointer magic (Closes: #195018)

[ Michael Vogt ]
@@ -6624,7 +6624,7 @@ apt (0.7.23.1) unstable; urgency=low

[ Michael Vogt ]
* apt-pkg/pkgcache.cc:
- do not set internel "needs-configure" state for packages in
- do not set internal "needs-configure" state for packages in
triggers-pending state. dpkg will deal with the trigger and
it if does it before we trigger it, dpkg will error out
(LP: #414631)
@@ -6813,7 +6813,7 @@ apt (0.7.22) unstable; urgency=low
* doc/apt.conf.5.xml:
- merged patch from Aurélien Couderc to improve the text
(thanks!)
* [ABI] merged the libudev-dlopen branch, this allows to pass
* [ABI] merged the libudev-dlopen branch, this allows one to pass
"apt-udev-auto" to Acquire::Cdrom::mount and the cdrom method will
dynamically find/mount the cdrom device (if libhal is available)

@@ -7343,7 +7343,7 @@ apt (0.7.12) unstable; urgency=low
so that it can correct any missing dependencies
* debian/apt.cron.daily:
- sleep random amount of time (default within 0-30min) before
starting the upate to hit the mirrors less hard
starting the update to hit the mirrors less hard
* doc/apt_preferences.5.xml:
- fix typo
* added debian/README.source
@@ -7834,7 +7834,7 @@ apt (0.6.46.4) unstable; urgency=high
- added "Dpkg::StopOnError" variable that controls if apt
will abort on errors from dpkg
* apt-pkg/deb/debsrcrecords.{cc,h}:
- make the Buffer grow dynmaically (closes: #400874)
- make the Buffer grow dynamically (closes: #400874)
* Merged from Christian Perrier bzr branch:
- uk.po: New Ukrainian translation: 483t28f3u
- el.po: Update to 503t9f2u
@@ -9441,7 +9441,7 @@ apt (0.5.5) unstable; urgency=low
* When matching regexs always print a message. Change regex activation
charset. Closes: #147817
* Don't die if lines in sources.list are too long. Closes: #146846
* Show file name on apt-extracttemplate error messges. Closes: #151835
* Show file name on apt-extracttemplate error messages. Closes: #151835
* i18n gettext stuff, based on work from Michael Piefel: Closes: #95933
* Some highly unlikely memory faults. Closes: #155842
* C++ stuff for G++3.2. Closes: #162617, #165515,
@@ -9559,7 +9559,7 @@ apt (0.5.4) unstable; urgency=low
* Various changes to the locking metholodgy for --print-uris.
Closes: #100590
* Lame LD_LIBRARY_PATH thing. Closes: #98928
* apt-cache search searchs provide names too now. Closes: #98695
* apt-cache search searches provide names too now. Closes: #98695
* Checksum and long lines problem. Closes: #106591
* .aptignr and empty files are just a warning. Closes: #97364

@@ -9669,7 +9669,7 @@ apt (0.5.0) unstable; urgency=low
* Caching can be turned off by setting the cache file names blank.
* Ignores arches it does not know about when autocleaning. Closes: #72862
* New function in apt-config to return dirs, files, bools and integers.
* Fixed an odd litle bug in MarkInstall and fixed it up to handle
* Fixed an odd little bug in MarkInstall and fixed it up to handle
complex cases involving OR groups and provides.
68754 describes confusing messages which are the result of this..
Closes: #63149, #69394, #68754, #77683, #66806, #81486, #78712
@@ -9719,7 +9719,7 @@ apt (0.3.19) frozen unstable; urgency=low
* Fixed Jay's relative path bug
* Allowed source only CDs. Closes: #58952
* Space check is suppressed if --print-uris is given. Closes: #58965
* Clarified the documenation examples for non-us. Closes: #58646
* Clarified the documentation examples for non-us. Closes: #58646
* Typo in the package description. Closes: #60230
* Man Page typo. Closes: #60347
* Typo in Algorithms.cc. Closes: #63577
@@ -9770,7 +9770,7 @@ apt (0.3.16) unstable; urgency=low
* Now compiles on OpenBSD, Solaris and HP-UX
* Clarify segfault errors
* More debhelper fixes. Closes: #52662, #54566, #52090, #53531, #54769
* Fix for Joel's discovery of glibc removal behavoir.
* Fix for Joel's discovery of glibc removal behavior.
* Fix for Ben Collins file: uri from slink upgrade.
* Fixed resume code in FTP. Closes: #54323
* Take more precautions to prevent the corruption Joey Hess saw.
@@ -9896,7 +9896,7 @@ apt (0.3.7) unstable; urgency=low
* Added a check for an empty cache directory. Closes: #37963
* Return a failure code if -d is given and packages fail to download.
Closes: #38127
* Arranged for an ftp proxy specifing an http server to work. See the
* Arranged for an ftp proxy specifying an http server to work. See the
important note in the sources.list man page.
* Accounted for resumed files in the cps calculation. Closes: #36787
* Deal with duplicate same version different packages. Closes: #30237


+ 3
- 3
doc/acquire-additional-files.txt View File

@@ -217,9 +217,9 @@ To get all the filenames of all Translation-en files you can e.g. call:
apt-get indextargets --format '$(FILENAME)' "Identifier: Translations" "Language: en"

The line-based filtering and the formatting is rather crude and feature-
less by design: The default format is Debians standard format deb822 (in
particular: Field names are case-insensitive and the order of fields in
the stanza is undefined), so instead of apt reimplementing powerful
less by design: The default format is Debian's standard format deb822
(in particular: Field names are case-insensitive and the order of fields
in the stanza is undefined), so instead of apt reimplementing powerful
filters and formatting for this command, it is recommend to use piping
and dedicated tools like 'grep-dctrl' if you need more than the basics
provided.


+ 1
- 1
doc/apt-key.8.xml View File

@@ -133,7 +133,7 @@
<listitem>
<para>
Pass advanced options to gpg. With <command>adv --recv-key</command> you
can e.g. download key from keyservers directly into the the trusted set of
can e.g. download key from keyservers directly into the trusted set of
keys. Note that there are <emphasis>no</emphasis> checks performed, so it is
easy to completely undermine the &apt-secure; infrastructure if used without
care.


+ 1
- 1
doc/apt-verbatim.ent View File

@@ -250,7 +250,7 @@

<!-- good and bad just refers to matching and not matching a pattern…
It is not a remark about the specific perl version.
There is no way perl could be clasified "good" (or "bad") in any version… -->
There is no way perl could be classified "good" (or "bad") in any version… -->
<!ENTITY good-perl "5.20">
<!ENTITY bad-perl "5.24">



+ 1
- 1
doc/dpkg-tech.dbk View File

@@ -95,7 +95,7 @@ therefore not be configured while broken
</listitem>
</itemizedlist>
<para>
Each of these dependencies can specify a version and a depedency on that
Each of these dependencies can specify a version and a dependency on that
version, for example "&lt;= 0.5-1", "== 2.7.2-1", etc. The comparators
available are:-
</para>


+ 1
- 1
doc/examples/apt-https-method-example.conf View File

@@ -113,7 +113,7 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem";

Acquire::https[::repo.domain.tld]::IssuerCert "/path/to/issuer/cert.pem";

Allows to constrain the issuer of the server certificate (for all
Allows one to constrain the issuer of the server certificate (for all
https mirrors or a specific one) to a specific issuer. If the
server certificate has not been issued by this certificate,
connection fails.


+ 2
- 2
doc/examples/configure-index View File

@@ -239,7 +239,7 @@ Acquire
// HTTPS method configuration: uses the http
// - proxy config
// - cache-control values
// - Dl-Limit, Timout, ... values
// - Dl-Limit, Timeout, ... values
// if not set explicit for https
//
// see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz
@@ -464,7 +464,7 @@ Debug
pkgInitConfig "<BOOL>";
pkgProblemResolver "<BOOL>";
pkgProblemResolver::ShowScores "<BOOL>";
pkgDepCache::AutoInstall "<BOOL>"; // what packages apt install to satify dependencies
pkgDepCache::AutoInstall "<BOOL>"; // what packages apt installs to satisfy dependencies
pkgDepCache::Marker "<BOOL>";
pkgCacheGen "<BOOL>";
pkgAcquire "<BOOL>";


+ 2
- 2
doc/external-dependency-solver-protocol.txt View File

@@ -229,8 +229,8 @@ field. The following fields are supported in package stanzas:
Note: the Status field present in the dpkg database must not be passed
to the external solver, as it's an internal dpkg field. Installed and
other fields permit to encode the most relevant aspects of Status in
communications with solvers.
other fields permit one to encode the most relevant aspects of Status
in communications with solvers.

- **Hold:** (optional, defaults to `no`). Allowed values: `yes`,
`no`. When set to `yes`, the corresponding package is marked as "on


+ 1
- 1
doc/guide.dbk View File

@@ -22,7 +22,7 @@

<abstract>
<para>
This document provides an overview of how to use the the APT package manager.
This document provides an overview of how to use the APT package manager.
</para>
</abstract>



+ 5
- 4
doc/libapt-pkg2_to_3.txt View File

@@ -1,8 +1,9 @@
libapt-pkg v2 to v3 incorperates several source-incompatible changes that
people need to be aware of.. Many of this changes are done so that most old
source will continue to function, but perhaps at reduced functionality.
libapt-pkg v2 to v3 incorporates several source-incompatible changes
that people need to be aware of.. Many of this changes are done so that
most old source will continue to function, but perhaps at reduced
functionality.

* pkgDepCache is no longer self initilizing, you have to call the Init
* pkgDepCache is no longer self initializing, you have to call the Init
method separately after constructing it. Users of pkgCacheFile do not
need to worry about this
* GetCandidateVer/etc is gone from the pkgCache. It exists only in the


+ 1
- 1
doc/method.dbk View File

@@ -685,7 +685,7 @@ http - For HTTP servers
</orderedlist>
<para>
The two internal methods, copy and gzip, are used by the acquire code to
parallize and simplify the automatic decompression of package files as well as
parallelize and simplify the automatic decompression of package files as well as
copying package files around the file system. Both methods can be seen to act
the same except that one decompresses on the fly. APT uses them by generating
a copy URI that is formed identically to a file URI. The destination file is


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

@@ -2021,7 +2021,7 @@ msgstr ""
#: apt-key.8.xml:1
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of "
"e.g. download key from keyservers directly into the trusted set of "
"keys. Note that there are <emphasis>no</emphasis> checks performed, so it is "
"easy to completely undermine the &apt-secure; infrastructure if used without "
"care."
@@ -6802,7 +6802,7 @@ msgstr ""
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk:1
msgid ""
"This document provides an overview of how to use the the APT package "
"This document provides an overview of how to use the APT package "
"manager."
msgstr ""



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

@@ -2841,7 +2841,7 @@ msgstr "listet vertrauenswürdige Schlüssel mit Fingerabdrücken auf."
#: apt-key.8.xml
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of keys. "
"e.g. download key from keyservers directly into the trusted set of keys. "
"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
"to completely undermine the &apt-secure; infrastructure if used without care."
msgstr ""
@@ -9730,7 +9730,7 @@ msgstr "Version &apt-product-version;"
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk
msgid ""
"This document provides an overview of how to use the the APT package manager."
"This document provides an overview of how to use the APT package manager."
msgstr ""
"Dieses Dokument stellt eine Übersicht bereit, wie das APT-"
"Paketverwaltungsprogramm benutzt wird."


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

@@ -2898,7 +2898,7 @@ msgstr "Lista las claves de confianza."
#: apt-key.8.xml
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of keys. "
"e.g. download key from keyservers directly into the trusted set of keys. "
"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
"to completely undermine the &apt-secure; infrastructure if used without care."
msgstr ""
@@ -9597,7 +9597,7 @@ msgstr ""
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk
msgid ""
"This document provides an overview of how to use the the APT package manager."
"This document provides an overview of how to use the APT package manager."
msgstr ""
"Este documento ofrece una introducción sobre cómo usar el gestor de paquetes "
"APT."


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

@@ -2828,7 +2828,7 @@ msgstr "Afficher la liste des clés fiables."
#: apt-key.8.xml
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of keys. "
"e.g. download key from keyservers directly into the trusted set of keys. "
"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
"to completely undermine the &apt-secure; infrastructure if used without care."
msgstr ""
@@ -9559,7 +9559,7 @@ msgstr "Version &apt-product-version;"
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk
msgid ""
"This document provides an overview of how to use the the APT package manager."
"This document provides an overview of how to use the APT package manager."
msgstr ""
"Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
"paquets APT."


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

@@ -2866,7 +2866,7 @@ msgstr "Elenca le chiavi fidate."
#: apt-key.8.xml
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of keys. "
"e.g. download key from keyservers directly into the trusted set of keys. "
"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
"to completely undermine the &apt-secure; infrastructure if used without care."
msgstr ""
@@ -9730,7 +9730,7 @@ msgstr "Versione &apt-product-version;"
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk
msgid ""
"This document provides an overview of how to use the the APT package manager."
"This document provides an overview of how to use the APT package manager."
msgstr ""
"Questo documento fornisce una panoramica su come usare il gestore di "
"pacchetti APT."
@@ -13322,7 +13322,7 @@ msgstr "che userà gli archivi già scaricati e presenti sul disco."
#~ "The binary override file is fully compatible with &dpkg-scanpackages;. It "
#~ "contains 4 fields separated by spaces. The first field is the package "
#~ "name, the second is the priority to force that package to, the third is "
#~ "the the section to force that package to and the final field is the "
#~ "the section to force that package to and the final field is the "
#~ "maintainer permutation field."
#~ msgstr ""
#~ "Il file override binario è completamente compatibile con &dpkg-"


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

@@ -2770,7 +2770,7 @@ msgstr "信頼キーとそのフィンガープリントを一覧表示します
#: apt-key.8.xml
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of keys. "
"e.g. download key from keyservers directly into the trusted set of keys. "
"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
"to completely undermine the &apt-secure; infrastructure if used without care."
msgstr ""
@@ -9291,7 +9291,7 @@ msgstr "バージョン &apt-product-version;"
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk
msgid ""
"This document provides an overview of how to use the the APT package manager."
"This document provides an overview of how to use the APT package manager."
msgstr "本文書は APT パッケージマネージャの使い方の概要を提供します。"

#. type: Content of: <book><bookinfo>


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

@@ -2921,7 +2921,7 @@ msgstr "Som betrouwbare sleutels op met hun vingerafdruk."
#: apt-key.8.xml
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of keys. "
"e.g. download key from keyservers directly into the trusted set of keys. "
"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
"to completely undermine the &apt-secure; infrastructure if used without care."
msgstr ""
@@ -9887,7 +9887,7 @@ msgstr "Versie &apt-product-version;"
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk
msgid ""
"This document provides an overview of how to use the the APT package manager."
"This document provides an overview of how to use the APT package manager."
msgstr ""
"Dit document geeft een overzicht van het gebruik van de pakketmanager APT."



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

@@ -2946,7 +2946,7 @@ msgstr "Wyświetla listę zaufanych kluczy."
#: apt-key.8.xml
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of keys. "
"e.g. download key from keyservers directly into the trusted set of keys. "
"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
"to completely undermine the &apt-secure; infrastructure if used without care."
msgstr ""
@@ -8752,7 +8752,7 @@ msgstr ""
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk
msgid ""
"This document provides an overview of how to use the the APT package manager."
"This document provides an overview of how to use the APT package manager."
msgstr "Dokument zawiera opis używania menadżera pakietów APT."

#. type: Content of: <book><bookinfo>


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

@@ -2840,7 +2840,7 @@ msgstr "Lista as chaves de confiança."
#: apt-key.8.xml
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of keys. "
"e.g. download key from keyservers directly into the trusted set of keys. "
"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
"to completely undermine the &apt-secure; infrastructure if used without care."
msgstr ""
@@ -9522,7 +9522,7 @@ msgstr "Versão &apt-product-version;"
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk
msgid ""
"This document provides an overview of how to use the the APT package manager."
"This document provides an overview of how to use the APT package manager."
msgstr ""
"Este documento disponibiliza uma visão geral de como usar o gestor de "
"pacotes APT."


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

@@ -1988,7 +1988,7 @@ msgstr ""
#: apt-key.8.xml
msgid ""
"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
"e.g. download key from keyservers directly into the the trusted set of keys. "
"e.g. download key from keyservers directly into the trusted set of keys. "
"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
"to completely undermine the &apt-secure; infrastructure if used without care."
msgstr ""
@@ -7113,7 +7113,7 @@ msgstr ""
#. type: Content of: <book><bookinfo><abstract><para>
#: guide.dbk
msgid ""
"This document provides an overview of how to use the the APT package manager."
"This document provides an overview of how to use the APT package manager."
msgstr ""

#. type: Content of: <book><bookinfo>


+ 1
- 1
doc/style.txt View File

@@ -50,7 +50,7 @@ standard library, but not for my code.
Arguments and Ownership
~~~~~~~~~~~~~~~~~~~~~~~
[much of the code follows this now]
These guidlines should be followed except in two cases.. the first
These guidelines should be followed except in two cases.. the first
is where it makes no sense, such as in a casting operator and the second is to
retain API compatibility (this should be rare, since a change in the input
almost always designates a change in ownership rules).


+ 1
- 1
ftparchive/contents.cc View File

@@ -140,7 +140,7 @@ GenContents::Node *GenContents::Grab(GenContents::Node *Top,const char *Name,
// Collision!
if (Res == 0)
{
// See if this the the same package (multi-version dup)
// See if this is the same package (multi-version dup)
if (Top->Package == Package ||
strcasecmp(Top->Package,Package) == 0)
return Top;


+ 2
- 2
ftparchive/writer.cc View File

@@ -411,7 +411,7 @@ bool PackagesWriter::DoPackage(string FileName)
if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,FileSize) == false)
return false;
// Lookup the overide information
// Lookup the override information
pkgTagSection &Tags = Db.Control.Section;
string Package = Tags.FindS("Package");
string Architecture;
@@ -659,7 +659,7 @@ bool SourcesWriter::DoPackage(string FileName)
return _error->Error("Could not find a Source entry in the DSC '%s'",FileName.c_str());
Tags.Trim();

// Lookup the overide information, finding first the best priority.
// Lookup the override information, finding first the best priority.
string BestPrio;
string Bins = Tags.FindS("Binary");
char Buffer[Bins.length() + 1];


+ 2
- 2
methods/basehttp.cc View File

@@ -443,7 +443,7 @@ BaseHttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)
// BaseHttpMethod::SigTerm - Handle a fatal signal /*{{{*/
// ---------------------------------------------------------------------
/* This closes and timestamps the open file. This is necessary to get
resume behavoir on user abort */
resume behavior on user abort */
void BaseHttpMethod::SigTerm(int)
{
if (FailFd == -1)
@@ -585,7 +585,7 @@ int BaseHttpMethod::Loop()
if (Server->IsOpen() == false)
QueueBack = Queue;

// Connnect to the host
// Connect to the host
if (Server->Open() == false)
{
Fail(true);


+ 2
- 2
methods/ftp.cc View File

@@ -6,7 +6,7 @@
FTP Acquire Method - This is the FTP acquire method for APT.

This is a very simple implementation that does not try to optimize
at all. Commands are sent syncronously with the FTP server (as the
at all. Commands are sent synchronously with the FTP server (as the
rfc recommends, but it is not really necessary..) and no tricks are
done to speed things along.
@@ -974,7 +974,7 @@ FtpMethod::FtpMethod() : aptMethod("ftp","1.0",SendConfig)
// FtpMethod::SigTerm - Handle a fatal signal /*{{{*/
// ---------------------------------------------------------------------
/* This closes and timestamps the open file. This is necessary to get
resume behavoir on user abort */
resume behavior on user abort */
void FtpMethod::SigTerm(int)
{
if (FailFd == -1)


+ 1
- 1
methods/gpgv.cc View File

@@ -120,7 +120,7 @@ static void PushEntryWithKeyID(std::vector<std::string> &Signers, char * const b
// skip the message
while (*p && !isspace(*p))
++p;
// skip the seperator whitespace
// skip the separator whitespace
++p;
// skip the hexdigit fingerprint
while (*p && isxdigit(*p))


+ 1
- 1
test/integration/framework View File

@@ -1202,7 +1202,7 @@ signreleasefiles() {
# FIXME: This should be the full name, but we can't encode the space properly currently
SIGUSERS="${SIGUSERS} -u ${SIGNER#* }"
if [ "${SIGNER}" = 'Rex Expired' ]; then
# the key is expired, so gpg doesn't allow to sign with and the --faked-system-time
# the key is expired, so gpg doesn't allow one to sign with and the --faked-system-time
# option doesn't exist anymore (and using faketime would add a new obscure dependency)
# therefore we 'temporary' make the key not expired and restore a backup after signing
cp "${REXKEY}.sec" "$SECEXPIREBAK"


+ 1
- 1
test/integration/test-apt-ftparchive-by-hash View File

@@ -23,7 +23,7 @@ confighashes 'SHA256' 'SHA512'
# enable by-hash in apt-ftparchive
echo 'APT::FTPArchive::DoByHash "1";' >> aptconfig.conf

# build one pacakge
# build one package
buildsimplenativepackage 'foo' 'i386' '1' 'unstable'
buildaptarchivefromincoming



+ 1
- 1
test/integration/test-apt-ftparchive-cachedb View File

@@ -64,7 +64,7 @@ Tree "dists/test" {
};
EOF

# build one pacakge
# build one package
buildsimplenativepackage 'foo' 'i386' '1' 'test'
mv incoming/* aptarchive/pool/main/



+ 1
- 1
test/integration/test-apt-ftparchive-cachedb-lp1274466 View File

@@ -16,7 +16,7 @@ if command -v db_dump-5 >/dev/null 2>&1; then
db_dump=db_dump-5
fi

# gather the db and the deb, ensure mtime is not modfied as its saved in the DB
# gather the db and the deb, ensure mtime is not modified as its saved in the DB
cp -p "$TESTDIR/deb-lp1274466-cachedb.deb" foo_1_i386.deb
cp -p "$TESTDIR/cachedb-lp1274466-old-format.db" old-format.db



+ 1
- 1
test/integration/test-apt-source-and-build-dep View File

@@ -28,7 +28,7 @@ insertsource 'stable' 'foo' 'all' '0.5'
insertpackage 'stable' 'foo' 'all' '1.0'
insertsource 'stable' 'foo' 'all' '1.0'

# this packages exists only as sources, add two versions to ensure that
# these packages exists only as sources, add two versions to ensure that
# apt will pick the higher version number (bts #731853)
insertsource 'wheezy' 'foo' 'all' '0.0.1'
insertsource 'wheezy' 'foo' 'all' '0.1'


+ 2
- 2
test/integration/test-bug-770291-reinstall View File

@@ -56,7 +56,7 @@ Conf dependsb (1 unstable [i386])
Conf dependsa (1 unstable [i386])' aptget install --reinstall dependsa dependsb -s

# there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present
# which is very very risky to depend on (and apt doesn't know about that anyhow).
# which is very risky to depend on (and apt doesn't know about that anyhow).
testfailure aptget install --reinstall predependsa predependsb -s -o Debug::pkgPackageManager=1
testsuccess grep "^E: Couldn't configure predependsa:i386, probably a dependency cycle.$" rootdir/tmp/testfailure.output

@@ -89,7 +89,7 @@ Conf dependsb (1 unstable [i386])
Conf dependsa (1 unstable [i386])' aptget install dependsa dependsb -s

# there is a chance dpkg can actually do these, BUT this depends on the maintainerscripts (not) present
# which is very very risky to depend on (and apt doesn't know about that anyhow).
# which is very risky to depend on (and apt doesn't know about that anyhow).
testfailure aptget install predependsa predependsb -s -o Debug::pkgPackageManager=1
testsuccess grep "^E: Couldn't configure predependsa:i386, probably a dependency cycle.$" rootdir/tmp/testfailure.output



+ 1
- 1
test/integration/test-pdiff-usage View File

@@ -210,7 +210,7 @@ Filename: pool/futurestuff_1.0_i386.deb
Size: 202200
SHA256: b46fd154615edaae5ba33c56a5cc0e7deaef23e2da3e4f129727fd660f28f050
Description: some cool and shiny future stuff
This package will appear in the next next mirror update
This package will appear in the next^2 mirror update
Description-md5: d5f89fbbc2ce34c455dfee9b67d82b6b' >> aptarchive/Packages

compressfile 'aptarchive/Packages'


+ 1
- 1
test/integration/test-releasefile-valid-until View File

@@ -48,7 +48,7 @@ runtest 'rejected' 'bad Max-Valid (bad Until, bad Min-Valid) <' 'now - 7 days' '
runtest 'rejected' 'bad Max-Valid (bad Until, bad Min-Valid) >' 'now - 7 days' 'now - 2 days' -o Acquire::Max-ValidTime=12096 -o Acquire::Min-ValidTime=241920

sed -i -e 's#\(deb\(-src\)\?\) #\1 [check-valid-until=no] #' rootdir/etc/apt/sources.list.d/*
runtest 'accepted' 'bad Until but overriden by sources option' 'now - 7 days' 'now - 4 days'
runtest 'accepted' 'bad Until but overridden by sources option' 'now - 7 days' 'now - 4 days'

sed -i -e 's#\(deb\(-src\)\?\) \[check-valid-until=no\] #\1 [valid-until-max=86400] #' rootdir/etc/apt/sources.list.d/*
runtest 'rejected' 'bad Max-Valid (good Until) via sources option' 'now - 7 days' 'now + 4 days'


+ 1
- 1
test/integration/test-releasefile-verification View File

@@ -383,7 +383,7 @@ runtest3() {
done
}

# diable some protection by default and ensure we still do the verification
# disable some protection by default and ensure we still do the verification
# correctly
cat > rootdir/etc/apt/apt.conf.d/weaken-security <<EOF
Acquire::AllowInsecureRepositories "1";


+ 1
- 1
triehash/triehash.pl View File

@@ -296,7 +296,7 @@ package Trie {
return $self->alignpower2(length $key);
}

# Rebuild the trie, splitting at ambigous chars, and unifying key lengths
# Rebuild the trie, splitting at ambiguous chars, and unifying key lengths
sub rebuild_tree {
my $self = shift;
# Determine if/where we need to split before an ambiguous character


Loading…
Cancel
Save