From 9983999d294887046abf386adc31190700d89b61 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Mon, 13 Oct 2014 10:57:30 +0200
Subject: Fix backward compatiblity of the new
 pkgAcquireMethod::DropPrivsOrDie()

Do not drop privileges in the methods when using a older version of
libapt that does not support the chown magic in partial/ yet. To
do this DropPrivileges() now will ignore a empty Apt::Sandbox::User.

Cleanup all hardcoded _apt along the way.
---
 methods/ftp.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'methods/ftp.cc')

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 5b739ea06..0504e5872 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -988,6 +988,10 @@ bool FtpMethod::Configuration(string Message)
       return false;
    
    TimeOut = _config->FindI("Acquire::Ftp::Timeout",TimeOut);
+
+   // no more active ftp, sorry
+   DropPrivsOrDie();
+
    return true;
 }
 									/*}}}*/
@@ -1141,8 +1145,5 @@ int main(int, const char *argv[])
    
    FtpMethod Mth;
 
-   // no more active ftp, sorry
-   Mth.DropPrivsOrDie();
-   
    return Mth.Run();
 }
-- 
cgit v1.2.3