diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-10 14:47:03 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-10 14:47:03 +0200 |
| commit | ac00cca724734db58ad14ab8c77d445d0df3bc9f (patch) | |
| tree | f476daeecf8cff875e074a819a9229b8a670435a /apt-private | |
| parent | c0a5e4644c8cf77feb035cfe8961f40099e1e3c6 (diff) | |
| parent | a3f1d60cb75ab83f63a52a43c056a4752c8fdeb2 (diff) | |
| download | apt-ac00cca724734db58ad14ab8c77d445d0df3bc9f.tar.gz | |
Merge remote-tracking branch 'mvo/bugfix/apt-get-source-unauthenticated-warning' into debian/sid
Diffstat (limited to 'apt-private')
| -rw-r--r-- | apt-private/private-download.cc | 5 | ||||
| -rw-r--r-- | apt-private/private-download.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc index a095f0c67..be7d23c31 100644 --- a/apt-private/private-download.cc +++ b/apt-private/private-download.cc @@ -28,6 +28,11 @@ bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser) if (UntrustedList == "") return true; + return AuthPrompt(UntrustedList, PromptUser); +} + +bool AuthPrompt(std::string UntrustedList, bool const PromptUser) +{ ShowList(c2out,_("WARNING: The following packages cannot be authenticated!"),UntrustedList,""); if (_config->FindB("APT::Get::AllowUnauthenticated",false) == true) diff --git a/apt-private/private-download.h b/apt-private/private-download.h index a108aa531..a90ac7eaa 100644 --- a/apt-private/private-download.h +++ b/apt-private/private-download.h @@ -5,7 +5,13 @@ class pkgAcquire; +// Check if all files in the fetcher are authenticated APT_PUBLIC bool CheckAuth(pkgAcquire& Fetcher, bool const PromptUser); + +// show a authentication warning prompt and return true if the system +// should continue +APT_PUBLIC bool AuthPrompt(std::string UntrustedList, bool const PromptUser); + APT_PUBLIC bool AcquireRun(pkgAcquire &Fetcher, int const PulseInterval, bool * const Failure, bool * const TransientNetworkFailure); #endif |