rred: Only call pkgInitConfig() in test mode

[apt.git] / methods / server.cc

diff --git a/methods/server.cc b/methods/server.cc
index 650a4aeb8e3d19f1e92885ed2a99349a9114be8c..d5188d4a31450a81248b7269b87b4edc24602a58 100644 (file)
--- a/methods/server.cc
+++ b/methods/server.cc
@@ -114,7 +114,7 @@ bool ServerState::HeaderLine(string Line)
 
    // Parse off any trailing spaces between the : and the next word.
    string::size_type Pos2 = Pos;
-   while (Pos2 < Line.length() && isspace(Line[Pos2]) != 0)
+   while (Pos2 < Line.length() && isspace_ascii(Line[Pos2]) != 0)
       Pos2++;
 
    string Tag = string(Line,0,Pos);
@@ -252,17 +252,6 @@ bool ServerState::AddPartialFileToHashes(FileFd &File)                     /*{{{*/
 }
                                                                        /*}}}*/
 
-bool ServerMethod::Configuration(string Message)                       /*{{{*/
-{
-   if (pkgAcqMethod::Configuration(Message) == false)
-      return false;
-
-   DropPrivsOrDie();
-
-   return true;
-}
-                                                                       /*}}}*/
-
 // ServerMethod::DealWithHeaders - Handle the retrieved header data    /*{{{*/
 // ---------------------------------------------------------------------
 /* We look at the header data we got back from the server and decide what
@@ -753,8 +742,8 @@ unsigned long long ServerMethod::FindMaximumObjectSizeInQueue() const       /*{{{*/
    return MaxSizeInQueue;
 }
                                                                        /*}}}*/
-ServerMethod::ServerMethod(const char *Ver,unsigned long Flags) :      /*{{{*/
-   pkgAcqMethod(Ver, Flags), Server(nullptr), File(NULL), PipelineDepth(10),
+ServerMethod::ServerMethod(char const * const Binary, char const * const Ver,unsigned long const Flags) :/*{{{*/
+   aptMethod(Binary, Ver, Flags), Server(nullptr), File(NULL), PipelineDepth(10),
    AllowRedirect(false), Debug(false)
 {
 }