fix arguments for MarkInstall so packages are really marked as automatic

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

diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 7778ae595a49d4f07c1a79d151884f728217f202..6fcd3b8ce4e1a110c9efd9639931d5233de0f78e 100644 (file)
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -22,7 +22,7 @@ class FileFd;
 class indexRecords;
 class pkgCdromStatus;
 
 class indexRecords;
 class pkgCdromStatus;
 

-class IndexCopy
+class IndexCopy                                                                /*{{{*/

 {
    protected:
    
 {
    protected:
    


@@ -45,8 +45,8 @@ class IndexCopy
                     pkgCdromStatus *log);
    virtual ~IndexCopy() {};
 };
                     pkgCdromStatus *log);
    virtual ~IndexCopy() {};
 };

-
-class PackageCopy : public IndexCopy
+                                                                       /*}}}*/
+class PackageCopy : public IndexCopy                                   /*{{{*/

 {
    protected:
    
 {
    protected:
    


@@ -57,8 +57,8 @@ class PackageCopy : public IndexCopy
    
    public:
 };
    
    public:
 };

-
-class SourceCopy : public IndexCopy
+                                                                       /*}}}*/
+class SourceCopy : public IndexCopy                                    /*{{{*/

 {
    protected:
    
 {
    protected:
    


@@ -69,8 +69,8 @@ class SourceCopy : public IndexCopy
    
    public:
 };
    
    public:
 };

-
-class TranslationsCopy
+                                                                       /*}}}*/
+class TranslationsCopy                                                 /*{{{*/

 {
    protected:
    pkgTagSection *Section;
 {
    protected:
    pkgTagSection *Section;


@@ -79,9 +79,8 @@ class TranslationsCopy
    bool CopyTranslations(string CDROM,string Name,vector<string> &List,
                         pkgCdromStatus *log);
 };
    bool CopyTranslations(string CDROM,string Name,vector<string> &List,
                         pkgCdromStatus *log);
 };

-
-
-class SigVerify 
+                                                                       /*}}}*/
+class SigVerify                                                                /*{{{*/

 {
    bool Verify(string prefix,string file, indexRecords *records);
    bool CopyMetaIndex(string CDROM, string CDName, 
 {
    bool Verify(string prefix,string file, indexRecords *records);
    bool CopyMetaIndex(string CDROM, string CDName, 


@@ -90,8 +89,16 @@ class SigVerify
  public:
    bool CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
                      vector<string> PkgList,vector<string> SrcList);
  public:
    bool CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
                      vector<string> PkgList,vector<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,
+                             int const &statusfd = -1) {
+      int fd[2];
+      return RunGPGV(File, FileOut, statusfd, fd);
+   };
+};
+                                                                       /*}}}*/

 
 #endif
 
 #endif