Merge branch 'feature/extractar-filefd' into debian/experimental

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index df3f8828f805e30ba2f4bf87e9659391deb874cc..637aae1249ba88ab4457291546905b768c3e0ee2 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -32,13 +32,23 @@ const char *Prog;
 
 class GzipMethod : public pkgAcqMethod
 {
 
 class GzipMethod : public pkgAcqMethod
 {

-   virtual bool Fetch(FetchItem *Itm);
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   virtual bool Configuration(std::string Message) APT_OVERRIDE;

    
    public:
    
    GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
 };
 
    
    public:
    
    GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
 };
 

+bool GzipMethod::Configuration(std::string Message)
+{
+   if (pkgAcqMethod::Configuration(Message) == false)
+      return false;
+
+   DropPrivsOrDie();
+
+   return true;
+}

 
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 // ---------------------------------------------------------------------
 
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 // ---------------------------------------------------------------------


@@ -81,7 +91,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       return false;
 
    // Read data from source, generate checksums and write
       return false;
 
    // Read data from source, generate checksums and write

-   Hashes Hash;
+   Hashes Hash(Itm->ExpectedHashes);

    bool Failed = false;
    while (1) 
    {
    bool Failed = false;
    while (1) 
    {


@@ -139,5 +149,6 @@ int main(int, char *argv[])
    ++Prog;
 
    GzipMethod Mth;
    ++Prog;
 
    GzipMethod Mth;

+

    return Mth.Run();
 }
    return Mth.Run();
 }