diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-11-11 11:10:55 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-11-11 11:10:55 +0000 |
| commit | 5fa47ca73fa445056043b097bb9caf537df1f84a (patch) | |
| tree | e26efe912730f5f449d887198f83d2faa5be4b8a /apt-pkg | |
| parent | e362d060a47ec3c7f487fa8e37eddbc72ac02d13 (diff) | |
| parent | 1229eb44efd5aa59e3b34ddfe8b7e13f09eb055f (diff) | |
Merge branch 'remove-methods' into 'main'
Remove ftp, rsh, ssh methods (disabled since 1.8)
See merge request apt-team/apt!384
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire-worker.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 696a3e0b8..4840ea16a 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -98,8 +98,6 @@ bool pkgAcquire::Worker::Start() std::string Method; if (_config->Exists(confItem)) Method = _config->FindFile(confItem.c_str()); - else if (Access == "ftp" || Access == "rsh" || Access == "ssh") - return _error->Error(_("The method '%s' is unsupported and disabled by default. Consider switching to http(s). Set Dir::Bin::Methods::%s to \"%s\" to enable it again."), Access.c_str(), Access.c_str(), Access.c_str()); else Method = _config->FindDir(methodsDir) + Access; if (FileExists(Method) == false) |