Merge branch 'debian/sid' into debian/experimental

[apt.git] / cmdline / apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 1943a0fa76d6ae7455ca061529967e1d06c878da..bd866bc8c66ee3e510d456b7593558ded17ae2cb 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -76,6 +76,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <sys/ioctl.h>

 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/statvfs.h>


@@ -755,6 +756,7 @@ static bool DoSource(CommandLine &CmdL)
 
    // Load the requestd sources into the fetcher
    unsigned J = 0;
 
    // Load the requestd sources into the fetcher
    unsigned J = 0;

+   std::string UntrustedList;

    for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++)
    {
       string Src;
    for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++)
    {
       string Src;


@@ -763,6 +765,9 @@ static bool DoSource(CommandLine &CmdL)
       if (Last == 0) {
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       }
       if (Last == 0) {
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
       }

+
+      if (Last->Index().IsTrusted() == false)
+         UntrustedList += Src + " ";

       
       string srec = Last->AsStr();
       string::size_type pos = srec.find("\nVcs-");
       
       string srec = Last->AsStr();
       string::size_type pos = srec.find("\nVcs-");


@@ -848,6 +853,10 @@ static bool DoSource(CommandLine &CmdL)
                        I->Hashes, I->Size, Last->Index().SourceInfo(*Last,*I), Src);
       }
    }
                        I->Hashes, I->Size, Last->Index().SourceInfo(*Last,*I), Src);
       }
    }

+
+   // check authentication status of the source as well
+   if (UntrustedList != "" && !AuthPrompt(UntrustedList, false))
+      return false;

    
    // Display statistics
    unsigned long long FetchBytes = Fetcher.FetchNeeded();
    
    // Display statistics
    unsigned long long FetchBytes = Fetcher.FetchNeeded();