diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 13:15:38 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:20 +0100 |
| commit | 36adf6dd0504d7b280e93f5206d93ee5f7f13e84 (patch) | |
| tree | e3899cd35d9f48cbb7ebe6450387d835922abb91 /apt-pkg | |
| parent | 7062f2a5a1bdb8c0e3c4b3b004e092046d1034ba (diff) | |
netrc: Remove deprecated function maybe_add_auth()
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/netrc.cc | 9 | ||||
| -rw-r--r-- | apt-pkg/contrib/netrc.h | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc index 48114ba3c..ee1996f8d 100644 --- a/apt-pkg/contrib/netrc.cc +++ b/apt-pkg/contrib/netrc.cc @@ -142,15 +142,6 @@ bool MaybeAddAuth(FileFd &NetRCFile, URI &Uri) return false; } -void maybe_add_auth(URI &Uri, std::string NetRCFile) -{ - if (FileExists(NetRCFile) == false) - return; - FileFd fd; - if (fd.Open(NetRCFile, FileFd::ReadOnly)) - MaybeAddAuth(fd, Uri); -} - /* Check if we are authorized. */ bool IsAuthorized(pkgCache::PkgFileIterator const I, std::vector<std::unique_ptr<FileFd>> &authconfs) { diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h index 80d95acc1..96a5a0973 100644 --- a/apt-pkg/contrib/netrc.h +++ b/apt-pkg/contrib/netrc.h @@ -32,8 +32,6 @@ class URI; class FileFd; -APT_DEPRECATED_MSG("Use FileFd-based MaybeAddAuth instead") -void maybe_add_auth(URI &Uri, std::string NetRCFile); bool MaybeAddAuth(FileFd &NetRCFile, URI &Uri); bool IsAuthorized(pkgCache::PkgFileIterator const I, std::vector<std::unique_ptr<FileFd>> &authconfs) APT_HIDDEN; #endif |