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 | |
| parent | 7062f2a5a1bdb8c0e3c4b3b004e092046d1034ba (diff) | |
netrc: Remove deprecated function maybe_add_auth()
| -rw-r--r-- | apt-pkg/contrib/netrc.cc | 9 | ||||
| -rw-r--r-- | apt-pkg/contrib/netrc.h | 2 | ||||
| -rw-r--r-- | debian/libapt-pkg6.0.symbols | 1 |
3 files changed, 0 insertions, 12 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 diff --git a/debian/libapt-pkg6.0.symbols b/debian/libapt-pkg6.0.symbols index 4c2e44fae..f7bb2eff1 100644 --- a/debian/libapt-pkg6.0.symbols +++ b/debian/libapt-pkg6.0.symbols @@ -39,7 +39,6 @@ libapt-pkg.so.6.0 libapt-pkg6.0 #MINVER# (c++)"ParseQuoteWord(char const*&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@APTPKG_6.0" 0.8.0 (c++)"ReadConfigFile(Configuration&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool const&, unsigned int const&)@APTPKG_6.0" 0.8.0 (c++)"TokSplitString(char, char*, char**, unsigned long)@APTPKG_6.0" 0.8.0 - (c++)"maybe_add_auth(URI&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >)@APTPKG_6.0" 0.8.0 (c++)"pkgApplyStatus(pkgDepCache&)@APTPKG_6.0" 0.8.0 (c++)"CheckDomainList(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 0.8.0 (c++)"CreateDirectory(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@APTPKG_6.0" 0.8.0 |