X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/f5c0ab925fdceb1bc0ef0e958cae7d0fafb28caf..76abe9a5aad69eb7e67295588c6825cdae0341af:/cmdline/apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index b1260f06a..ebc8c94c2 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -629,9 +629,6 @@ static bool DoDownload(CommandLine &CmdL)
       return true;
    }
 
-   // Disable drop-privs if "_apt" can not write to the target dir
-   CheckDropPrivsMustBeDisabled(Fetcher);
-
    if (_error->PendingError() == true || CheckAuth(Fetcher, false) == false)
       return false;
 
@@ -850,9 +847,6 @@ static bool DoSource(CommandLine &CmdL)
       return true;
    }
 
-   // Disable drop-privs if "_apt" can not write to the target dir
-   CheckDropPrivsMustBeDisabled(Fetcher);
-
    // check authentication status of the source as well
    if (UntrustedList.empty() == false && AuthPrompt(UntrustedList, false) == false)
       return false;
@@ -1403,11 +1397,6 @@ static bool DoChangelog(CommandLine &CmdL)
 
    if (printOnly == false)
    {
-      // Disable drop-privs if "_apt" can not write to the target dir
-      CheckDropPrivsMustBeDisabled(Fetcher);
-      if (_error->PendingError() == true)
-	 return false;
-
       bool Failed = false;
       if (AcquireRun(Fetcher, 0, &Failed, NULL) == false || Failed == true)
 	 return false;
@@ -1498,11 +1487,21 @@ static bool DoIndexTargets(CommandLine &CmdL)
 	       << "Description: " << T->Description << "\n"
 	       << "URI: " << T->URI << "\n"
 	       << "Filename: " << filename << "\n"
-	       << "Optional: " << (T->IsOptional ? "yes" : "no") << "\n";
+	       << "Optional: " << (T->IsOptional ? "yes" : "no") << "\n"
+	       << "KeepCompressed: " << (T->KeepCompressed ? "yes" : "no") << "\n";
 	    for (std::map<std::string,std::string>::const_iterator O = AddOptions.begin(); O != AddOptions.end(); ++O)
 	       stanza << format_key(O->first) << ": " << O->second << "\n";
 	    for (std::map<std::string,std::string>::const_iterator O = T->Options.begin(); O != T->Options.end(); ++O)
-	       stanza << format_key(O->first) << ": " << O->second << "\n";
+	    {
+	       if (O->first == "PDIFFS")
+		  stanza << "PDiffs: " << O->second << "\n";
+	       else if (O->first == "COMPRESSIONTYPES")
+		  stanza << "CompressionTypes: " << O->second << "\n";
+	       else if (O->first == "DEFAULTENABLED")
+		  stanza << "DefaultEnabled: " << O->second << "\n";
+	       else
+		  stanza << format_key(O->first) << ": " << O->second << "\n";
+	    }
 	    stanza << "\n";
 
 	    if (Filtered)