rename AuthDone() -> CheckAuthDone()

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 401566cfcbccb03f92390d6e0f2e30b5ce29c0db..c90210af7df5f54487e73b9ab61c65441c9d55b2 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1577,7 +1577,6 @@ pkgAcqMetaSig::~pkgAcqMetaSig()                                           /*{{{*/
                                                                        /*}}}*/
 // pkgAcqMetaSig::Custom600Headers - Insert custom request headers     /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // pkgAcqMetaSig::Custom600Headers - Insert custom request headers     /*{{{*/
 // ---------------------------------------------------------------------

-/* The only header we use is the last-modified header. */

 string pkgAcqMetaSig::Custom600Headers() const
 {
    string FinalFile = _config->FindDir("Dir::State::lists");
 string pkgAcqMetaSig::Custom600Headers() const
 {
    string FinalFile = _config->FindDir("Dir::State::lists");


@@ -1612,7 +1611,7 @@ void pkgAcqMetaSig::Done(string Message,unsigned long long Size,
    }
    else 
    {
    }
    else 
    {

-      if(AuthDone(Message, RealURI) == true)
+      if(CheckAuthDone(Message, RealURI) == true)

       {
          std::string FinalFile = _config->FindDir("Dir::State::lists");
          FinalFile += URItoFileName(RealURI);
       {
          std::string FinalFile = _config->FindDir("Dir::State::lists");
          FinalFile += URItoFileName(RealURI);


@@ -1734,7 +1733,6 @@ void pkgAcqMetaIndex::Init(std::string URIDesc, std::string ShortDesc)
 }
 // pkgAcqMetaIndex::Custom600Headers - Insert custom request headers   /*{{{*/
 // ---------------------------------------------------------------------
 }
 // pkgAcqMetaIndex::Custom600Headers - Insert custom request headers   /*{{{*/
 // ---------------------------------------------------------------------

-/* The only header we use is the last-modified header. */

 string pkgAcqMetaIndex::Custom600Headers() const
 {
    string Final = _config->FindDir("Dir::State::lists");
 string pkgAcqMetaIndex::Custom600Headers() const
 {
    string Final = _config->FindDir("Dir::State::lists");


@@ -1770,7 +1768,7 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,        /*{{{*/
    }
 }
                                                                        /*}}}*/
    }
 }
                                                                        /*}}}*/

-bool pkgAcqMetaBase::AuthDone(string Message, const string &RealURI)   /*{{{*/
+bool pkgAcqMetaBase::CheckAuthDone(string Message, const string &RealURI)      /*{{{*/

 {
    // At this point, the gpgv method has succeeded, so there is a
    // valid signature from a key in the trusted keyring.  We
 {
    // At this point, the gpgv method has succeeded, so there is a
    // valid signature from a key in the trusted keyring.  We


@@ -2121,7 +2119,7 @@ void pkgAcqMetaClearSig::Done(std::string Message,unsigned long long Size,
    }
    else
    {
    }
    else
    {

-      if(AuthDone(Message, RealURI) == true)
+      if(CheckAuthDone(Message, RealURI) == true)

       {
          string FinalFile = _config->FindDir("Dir::State::lists");
          FinalFile += URItoFileName(RealURI);
       {
          string FinalFile = _config->FindDir("Dir::State::lists");
          FinalFile += URItoFileName(RealURI);

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index e0739dcd2de6dc8c8c6af52a86c227da0f83acda..393f3a250969e802ce8d5880a975efdddbc01f6b 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -411,7 +411,7 @@ class pkgAcqMetaBase  : public pkgAcquire::Item
     *  \param Message The message block received from the fetch
     *  subprocess.
     */
     *  \param Message The message block received from the fetch
     *  subprocess.
     */

-   bool AuthDone(std::string Message, const std::string &RealURI);
+   bool CheckAuthDone(std::string Message, const std::string &RealURI);

 
    /** \brief Check that the release file is a release file for the
     *  correct distribution.
 
    /** \brief Check that the release file is a release file for the
     *  correct distribution.