guard pkg/grp hashtable creation changes

[apt.git] / methods / gpgv.cc

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 02fb8c356fcc14d96df066237acfb07584b0b888..488c16826e5c70ea2d45fcdbac8649fe287cb040 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -44,12 +44,22 @@ class GPGVMethod : public pkgAcqMethod
    
    protected:
    virtual bool Fetch(FetchItem *Itm);
-   
+   virtual bool Configuration(string Message);
    public:
    
    GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
 };
 
+bool GPGVMethod::Configuration(string Message)
+{
+   if (pkgAcqMethod::Configuration(Message) == false)
+      return false;
+
+   DropPrivsOrDie();
+
+   return true;
+}
+
 string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
                                         vector<string> &GoodSigners,
                                         vector<string> &BadSigners,
@@ -160,7 +170,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    waitpid(pid, &status, 0);
    if (Debug == true)
    {
-      std::clog << "apt-key exited\n";
+      ioprintf(std::clog, "gpgv exited with status %i\n", WEXITSTATUS(status));
    }
    
    if (WEXITSTATUS(status) == 0)
@@ -265,7 +275,5 @@ int main()
 
    GPGVMethod Mth;
 
-   Mth.DropPrivsOrDie();
-
    return Mth.Run();
 }