From 23e64f6d0facf9610c1042326ad9850e071e8349 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Wed, 4 Nov 2015 14:48:36 +0100
Subject: allow acquire method specific options via Binary scope

Allows users who know what they are getting themselves into with this
trick to e.g. disable privilege dropping for e.g. file:// until they can
fix up the permissions on those repositories. It helps also the test
framework and people with a similar setup (= me) to run in less modified
environments.
---
 methods/rred.cc | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'methods/rred.cc')

diff --git a/methods/rred.cc b/methods/rred.cc
index d2cefc943..b379d384d 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -13,6 +13,7 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
+#include "aptmethod.h"
 
 #include <stddef.h>
 #include <iostream>
@@ -532,7 +533,7 @@ class Patch {
    }
 };
 
-class RredMethod : public pkgAcqMethod {
+class RredMethod : public aptMethod {
    private:
       bool Debug;
 
@@ -680,18 +681,8 @@ class RredMethod : public pkgAcqMethod {
 	 return true;
       }
 
-      bool Configuration(std::string Message) APT_OVERRIDE
-      {
-	 if (pkgAcqMethod::Configuration(Message) == false)
-	    return false;
-
-	 DropPrivsOrDie();
-
-	 return true;
-      }
-
    public:
-      RredMethod() : pkgAcqMethod("2.0",SingleInstance | SendConfig), Debug(false) {}
+      RredMethod() : aptMethod("rred", "2.0",SingleInstance | SendConfig), Debug(false) {}
 };
 
 int main(int argc, char **argv)
-- 
cgit v1.2.3