From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 21 Jun 2012 11:19:04 +0000 (+0200)
Subject: update comments and add one FIXME for the next ABI break
X-Git-Tag: 0.9.13.exp1ubuntu1~51^2~3^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/479a2beb0f5605652689d74a78dd224b69ba2e8f?hp=--cc

update comments and add one FIXME for the next ABI break
---

479a2beb0f5605652689d74a78dd224b69ba2e8f
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 9723cddac..ddd3300f9 100644
--- 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
       {
+         // 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 (SigFile == DestFile && !IsPgpClearTextSignature(DestFile))
+         if (SigFile == DestFile && 
+             !IsPgpClearTextSignature(DestFile))
          {
             Failed(Message, Cfg);
             return;
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index c51add66e..a9cb45e9a 100644
--- 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);
 
+// check if the given file starts with a PGP cleartext signature
 bool IsPgpClearTextSignature(std::string const &FileName);
 
 // File string manipulators