support dash-escaped text in clearsigned files as implementations are

[apt.git] / apt-pkg / indexcopy.h

diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index e3de1afd97f1f6454d1a20ec43bd8802fadbc164..aa221158ec0569150d3bb6198a9e40a67046ffd3 100644 (file)
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -14,6 +14,9 @@
 #include <string>
 #include <stdio.h>
 
 #include <string>
 #include <stdio.h>
 

+#include <apt-pkg/gpgv.h>
+#include <apt-pkg/macros.h>
+

 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::vector;
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::vector;


@@ -96,13 +99,15 @@ class SigVerify                                                             /*{{{*/
    bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
                      std::vector<std::string> PkgList,std::vector<std::string> SrcList);
 
    bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::string> &SigList,
                      std::vector<std::string> PkgList,std::vector<std::string> SrcList);
 

-   /** \brief generates and run the command to verify a file with gpgv */
-   static bool RunGPGV(std::string const &File, std::string const &FileOut,
-                      int const &statusfd, int fd[2]);
-   inline static bool RunGPGV(std::string const &File, std::string const &FileOut,
+   __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,
+                      int const &statusfd, int fd[2]) {
+      ExecGPGV(File, FileOut, statusfd, fd);
+      return false;
+   };
+   __deprecated static bool RunGPGV(std::string const &File, std::string const &FileOut,

                              int const &statusfd = -1) {
                              int const &statusfd = -1) {

-      int fd[2];
-      return RunGPGV(File, FileOut, statusfd, fd);
+      ExecGPGV(File, FileOut, statusfd);
+      return false;

    };
 };
                                                                        /*}}}*/
    };
 };
                                                                        /*}}}*/