Browse Source

Fix several typos

This effectively merges branch 'typofixes-vlajos-20150807' of github.com:vlajos/apt
with the following commit:

commit 13cacb3e2e
Author: Veres Lajos <vlajos@gmail.com>
Date:   Sun Aug 9 00:12:53 2015 +0100

    typofix - https://github.com/vlajos/misspell_fixer

It has been rebased for a better commit message.
tags/debian/1.2.6
Veres Lajos Julian Andres Klode 5 years ago
parent
commit
8d89cda7d6
18 changed files with 37 additions and 37 deletions
  1. +1
    -1
      apt-inst/extract.cc
  2. +2
    -2
      apt-pkg/acquire-item.cc
  3. +2
    -2
      apt-pkg/algorithms.h
  4. +2
    -2
      apt-pkg/cdrom.cc
  5. +1
    -1
      apt-pkg/contrib/strutl.cc
  6. +1
    -1
      apt-pkg/contrib/strutl.h
  7. +1
    -1
      apt-pkg/deb/dpkgpm.cc
  8. +1
    -1
      apt-pkg/deb/dpkgpm.h
  9. +3
    -3
      apt-pkg/packagemanager.cc
  10. +2
    -2
      apt-pkg/pkgcache.cc
  11. +11
    -11
      debian/changelog
  12. +2
    -2
      doc/libapt-pkg2_to_3.txt
  13. +1
    -1
      test/integration/Packages-bug-591882-conkeror
  14. +2
    -2
      test/integration/status-bug-591882-conkeror
  15. +2
    -2
      test/integration/status-ubuntu-bug-614993
  16. +1
    -1
      test/integration/test-apt-update-nofallback
  17. +1
    -1
      test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
  18. +1
    -1
      test/integration/test-sourceslist-arch-plusminus-options

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

@@ -279,7 +279,7 @@ bool pkgExtract::Aborted()
map_ptrloc *Last = &FLPkg->Files;
/* Loop over all files, restore those that have been unpacked from their
dpkg-tmp entires */
dpkg-tmp entries */
while (Files.end() == false)
{
// Locate the hash bucket for the node and locate its group head


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

@@ -52,7 +52,7 @@

using namespace std;

static void printHashSumComparision(std::string const &URI, HashStringList const &Expected, HashStringList const &Actual) /*{{{*/
static void printHashSumComparison(std::string const &URI, HashStringList const &Expected, HashStringList const &Actual) /*{{{*/
{
if (_config->FindB("Debug::Acquire::HashSumMismatch", false) == false)
return;
@@ -1821,7 +1821,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile) /*{{{*/
if (Debug == true)
{
std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": Index has different hashes than parser, probably older, so fail pdiffing" << std::endl;
printHashSumComparision(CurrentPackagesFile, ServerHashes, TargetFileHashes);
printHashSumComparison(CurrentPackagesFile, ServerHashes, TargetFileHashes);
}
return false;
}


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

@@ -75,8 +75,8 @@ class pkgSimulate : public pkgPackageManager /*{{{*/
Policy iPolicy;
pkgDepCache Sim;
pkgDepCache::ActionGroup group;
// The Actuall installation implementation
// The Actual installation implementation
virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE;


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

@@ -367,7 +367,7 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
/*}}}*/
// ReduceSourceList - Takes the path list and reduces it /*{{{*/
// ---------------------------------------------------------------------
/* This takes the list of source list expressed entires and collects
/* This takes the list of source list expressed entries and collects
similar ones to form a single entry for each dist */
void pkgCdrom::ReduceSourcelist(string /*CD*/,vector<string> &List)
{
@@ -451,7 +451,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
// WriteSourceList - Write an updated sourcelist /*{{{*/
// ---------------------------------------------------------------------
/* This reads the old source list and copies it into the new one. It
appends the new CDROM entires just after the first block of comments.
appends the new CDROM entries just after the first block of comments.
This places them first in the file. It also removes any old entries
that were the same. */
bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)


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

@@ -1217,7 +1217,7 @@ vector<string> StringSplit(std::string const &s, std::string const &sep,
vector<string> split;
size_t start, pos;

// no seperator given, this is bogus
// no separator given, this is bogus
if(sep.size() == 0)
return split;



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

@@ -93,7 +93,7 @@ std::vector<std::string> VectorizeString(std::string const &haystack, char const
*
* \param input The input string.
*
* \param sep The seperator to use.
* \param sep The separator to use.
*
* \param maxsplit (optional) The maximum amount of splitting that
* should be done .


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

@@ -1588,7 +1588,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
// Check for an error code.
if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
{
// if it was set to "keep-dpkg-runing" then we won't return
// if it was set to "keep-dpkg-running" then we won't return
// here but keep the loop going and just report it as a error
// for later
bool const stopOnError = _config->FindB("Dpkg::StopOnError",true);


+ 1
- 1
apt-pkg/deb/dpkgpm.h View File

@@ -119,7 +119,7 @@ class pkgDPkgPM : public pkgPackageManager
void DoDpkgStatusFd(int statusfd);
void ProcessDpkgStatusLine(char *line);

// The Actuall installation implementation
// The Actual installation implementation
virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
virtual bool Remove(PkgIterator Pkg,bool Purge = false) APT_OVERRIDE;


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

@@ -6,7 +6,7 @@
Package Manager - Abstacts the package manager

More work is needed in the area of transitioning provides, ie exim
replacing smail. This can cause interesing side effects.
replacing smail. This can cause interesting side effects.

Other cases involving conflicts+replaces should be tested.
@@ -136,7 +136,7 @@ bool pkgPackageManager::FixMissing()
// PM::ImmediateAdd - Add the immediate flag recursivly /*{{{*/
// ---------------------------------------------------------------------
/* This adds the immediate flag to the pkg and recursively to the
dependendies
dependencies
*/
void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
{
@@ -189,7 +189,7 @@ bool pkgPackageManager::CreateOrderList()
if (I->VersionList == 0)
continue;
// Mark the package and its dependends for immediate configuration
// Mark the package and its dependents for immediate configuration
if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
NoImmConfigure == false) || ImmConfigureAll)
{


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

@@ -500,7 +500,7 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
if (S->CurrentState == pkgCache::State::UnPacked ||
S->CurrentState == pkgCache::State::HalfConfigured)
// we leave triggers alone complettely. dpkg deals with
// we leave triggers alone completely. dpkg deals with
// them in a hard-to-predict manner and if they get
// resolved by dpkg before apt run dpkg --configure on
// the TriggersPending package dpkg returns a error
@@ -802,7 +802,7 @@ bool pkgCache::DepIterator::IsImplicit() const
return false;
}
/*}}}*/
// ostream operator to handle string representation of a dependecy /*{{{*/
// ostream operator to handle string representation of a dependency /*{{{*/
// ---------------------------------------------------------------------
/* */
std::ostream& operator<<(std::ostream& out, pkgCache::DepIterator D)


+ 11
- 11
debian/changelog View File

@@ -1965,7 +1965,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 ListUpdate/AquireUpdate into update.{cc,h}
* Move ListUpdate/AcquireUpdate into update.{cc,h}
* Add new apt-pkg/install-progress.h with APT::Progress::PackageManager
progress reporting classes
* Move the status-fd progress reporting out of the pkgDPkgPM class
@@ -3282,7 +3282,7 @@ apt (0.8.16~exp13) experimental; urgency=low
* methods/http{s,}.cc:
- if a file without an extension is requested send an 'Accept: text/*'
header to avoid that the server chooses unsupported compressed files
in a content-negotation attempt (Closes: #657560)
in a content-negotiation attempt (Closes: #657560)
- remove the arbitrary MAXLEN limit for response lines (Closes: #658346)
* apt-pkg/aptconfiguration.cc:
- chroot if needed before calling dpkg --print-foreign-architectures
@@ -5502,7 +5502,7 @@ apt (0.7.26~exp3) experimental; urgency=low
* apt-pkg/deb/dpkgpm.cc:
- fix backgrounding when dpkg runs (closes: #486222)
* cmdline/apt-mark:
- show error on incorrect aguments (LP: #517917), thanks to
- show error on incorrect arguments (LP: #517917), thanks to
Torsten Spindler
* cmdline/apt-get.cc:
- if apt-get source foo=version or foo/distro can not be found,
@@ -5789,7 +5789,7 @@ apt (0.7.25) unstable; urgency=low
- add build-dependency on autotools-dev
- bump policy to 3.8.3 as we have no outdated manpages anymore
* debian/NEWS:
- fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
- fix a typo in 0.7.24: Already -> Already (Closes: #557674)
* ftparchive/writer.{cc,h}:
- add APT::FTPArchive::LongDescription to be able to disable them
* apt-pkg/deb/debsrcrecords.cc:
@@ -6484,7 +6484,7 @@ apt (0.7.15~exp3) experimental; urgency=low

[ Michael Vogt ]
* apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc:
- move the state file writting into the Go() implementation
- move the state file writing into the Go() implementation
of dpkgpm (closes: #498799)
* apt-pkg/algorithms.cc:
- fix simulation performance drop (thanks to Ferenc Wagner
@@ -7517,7 +7517,7 @@ apt (0.6.42.2) unstable; urgency=high
apt (0.6.42.1) unstable; urgency=low

* fix a incorrect example in the apt_prefrences man page
* fix a incorrect example in the apt_preferences man page
(thanks to Filipus Klutiero, closes: #282918)
* apt-pkg/pkgrecords.cc:
- revert patch from last version, it causes trouble on alpha
@@ -7684,7 +7684,7 @@ apt (0.6.36) experimental; urgency=low
added "Acquire::BrokenProxy" that will force apt to always
re-get the Release.gpg file (for broken proxies)
- debian/apt.cron.daily:
MinAge is defaulting to 2 days now to prevent over-aggresive removal
MinAge is defaulting to 2 days now to prevent over-aggressive removal
- apt-pkg/cdrom.cc:
honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
@@ -8734,7 +8734,7 @@ apt (0.5.5) unstable; urgency=low
ignore roots umask for these files. Closes: #108801
* Support larger config spaces. Closes: #111914
* 'apt-get update' no longer does 'Building Dependency Tree'.
* When matching regexs allways print a message. Change regex activation
* 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
@@ -8780,7 +8780,7 @@ apt (0.5.5) unstable; urgency=low
* When installing build-deps, make sure the new version will
satisfy build requirements. Closes: #178121
* Split offline and guide documentation into apt-doc. This was done so
that binary-arch builds do not require documention deps. Note, that
that binary-arch builds do not require documentation deps. Note, that
apt-doc is not installed on upgrades.
* Use doc-base, instead of dhelp directly. Closes: #110389
* Change http message 'Waiting for file' to 'Waiting for headers'.
@@ -9021,7 +9021,7 @@ apt (0.3.19) frozen unstable; urgency=low
* Typo in Algorithms.cc. Closes: #63577
* Evil dotty function in apt-cache for generating dependency graphs
with the as-yet-unpackaged GraphVis.
* Appears to have been fixed in Janurary.. Closes: #57981
* Appears to have been fixed in January.. Closes: #57981
* New config.guess/sub for the new archs. Closes: #60874
* Fixed error reporting for certain kinds of resolution failures.
Closes: #61327
@@ -9428,7 +9428,7 @@ apt (0.0.9) experimental; urgency=low

* Added ftp support.
* Various other less visible bug fixes.
* Fixed problem with segfault when apt-get invoked in a non-existant
* Fixed problem with segfault when apt-get invoked in a non-existent
directory (Bug #21863)
* Bumped policy to 2.4.1



+ 2
- 2
doc/libapt-pkg2_to_3.txt View File

@@ -27,11 +27,11 @@ source will continue to function, but perhaps at reduced functionality.
include the trailing \n.
* GenCaches::SelectFile accepts a site parameter now too.
* Global version compare functions are gone. If you
#define APT_COMPATABILITY 1
#define APT_COMPATIBILITY 1
They will come back as they were before. Code should be updated to
reference the compare functions to the VersioningSystem (VS) referenced
by the Cache or _system structures.
* Initialization is now two stage (define APT_COMPATABILITY..) The first
* Initialization is now two stage (define APT_COMPATIBILITY..) The first
stage, pkgInitConfig is called before commandline parsing, and
pkgInitSystem is called after. This gives the user the oppertunity to
override default settings from the config files before startup has been


+ 1
- 1
test/integration/Packages-bug-591882-conkeror View File

@@ -1685,7 +1685,7 @@ Conflicts: ttf-dejavu (<< 2.20-1)
Filename: pool/main/t/ttf-dejavu/ttf-dejavu-core_2.31-1_all.deb
Size: 1451418
MD5Sum: d3d8850ec0ef68d9b7655545ce0b2b22
Description: Vera font family derivate with additional characters
Description: Vera font family derivative with additional characters

Package: ucf
Priority: standard


+ 2
- 2
test/integration/status-bug-591882-conkeror View File

@@ -1256,7 +1256,7 @@ Version: 2.25-3
Replaces: ttf-dejavu (<< 2.20-1)
Depends: defoma
Conflicts: ttf-dejavu (<< 2.20-1)
Description: Vera font family derivate with additional characters
Description: Vera font family derivative with additional characters

Package: ttf-dejavu-extra
Status: install ok installed
@@ -1270,7 +1270,7 @@ Version: 2.25-3
Replaces: ttf-dejavu (<< 2.20-1)
Depends: defoma, ttf-dejavu-core
Conflicts: ttf-dejavu (<< 2.20-1)
Description: Vera font family derivate with additional characters
Description: Vera font family derivative with additional characters

Package: ttf-dejavu
Status: install ok installed


+ 2
- 2
test/integration/status-ubuntu-bug-614993 View File

@@ -4672,7 +4672,7 @@ Source: ttf-dejavu
Version: 2.30-2
Replaces: ttf-dejavu (<< 2.20-1)
Conflicts: ttf-dejavu (<< 2.20-1)
Description: Vera font family derivate with additional characters
Description: Vera font family derivative with additional characters
DejaVu provides an expanded version of the Vera font family aiming for
quality and broader Unicode coverage while retaining the original Vera
style. DejaVu currently works towards conformance with the Multilingual
@@ -4871,7 +4871,7 @@ Depends: libc6 (>= 2.7), zlib1g (>= 1:1.1.4)
Suggests: pciutils
Description: Generic PCI access library for X
Provides functionality for X to access the PCI bus and devices
in a platform-independant way.
in a platform-independent way.
Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>

Package: libc-bin


+ 1
- 1
test/integration/test-apt-update-nofallback View File

@@ -225,7 +225,7 @@ test_from_release_gpg_to_unsigned
msgmsg "test_cve_2012_0214"
test_cve_2012_0214

# ensure InRelase can not be subverted
# ensure InRelease can not be subverted
msgmsg "test_subvert_inrelease"
test_subvert_inrelease



+ 1
- 1
test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted View File

@@ -17,7 +17,7 @@ testfileexists() {
}

testfilemissing() {
msgtest 'Test for non-existance of file' "$1"
msgtest 'Test for non-existence of file' "$1"
test -e "$1" && msgfail || msgpass
rm -f "$1"
}


+ 1
- 1
test/integration/test-sourceslist-arch-plusminus-options View File

@@ -73,7 +73,7 @@ echo 'deb [arch-=mips,hurd-powerpc,i386] http://example.org/debian stable rocks'
testbinaries 'arch-=foreign,unknown,foreign' 'amd64' 'armel' 'armhf' 'mipsel' 'all'

echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list
testbinaries 'substract from a arch-set' 'i386' 'all'
testbinaries 'subtract from a arch-set' 'i386' 'all'

echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list
testbinaries 'useless subtract from a arch-set' 'i386' 'all'


Loading…
Cancel
Save