update comments and add one FIXME for the next ABI break

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 9723cddac59e41b5fe081bd474367e5036a9a3d2..ddd3300f91b50b12dc0532c20c86b41b0a0be439 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1235,10 +1235,14 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size,string Hash,  /
       }
       else
       {
       }
       else
       {

+         // FIXME: move this into pkgAcqMetaClearSig::Done on the next
+         //        ABI break
+

          // if we expect a ClearTextSignature (InRelase), ensure that
          // this is what we get and if not fail to queue a 
          // Release/Release.gpg, see #346386
          // if we expect a ClearTextSignature (InRelase), ensure that
          // this is what we get and if not fail to queue a 
          // Release/Release.gpg, see #346386

-         if (SigFile == DestFile && !IsPgpClearTextSignature(DestFile))
+         if (SigFile == DestFile && 
+             !IsPgpClearTextSignature(DestFile))

          {
             Failed(Message, Cfg);
             return;
          {
             Failed(Message, Cfg);
             return;

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index c51add66e7417491826039bff919e08dab6e4389..a9cb45e9aab48b08b97be51460128e3d25fab2ba 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -179,6 +179,7 @@ bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
 pid_t ExecFork();
 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 
 pid_t ExecFork();
 bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);
 

+// check if the given file starts with a PGP cleartext signature

 bool IsPgpClearTextSignature(std::string const &FileName);
 
 // File string manipulators
 bool IsPgpClearTextSignature(std::string const &FileName);
 
 // File string manipulators