From 4ba38b9f2611c04a0e23b84a365253e65cad2969 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 3 Jan 2018 23:55:33 +0100 Subject: simplify translating "lists directory missing" msg The appended "partial" should not be translated, but some translations got this wrong and now that there is also "auxfiles" we can just fix that problem by hiding these untranslatables from the translators. Gbp-Dch: Ignore --- apt-pkg/acquire.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'apt-pkg/acquire.cc') diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index b25a4434a..d964171a6 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -118,12 +118,12 @@ bool pkgAcquire::Setup(pkgAcquireStatus *Progress, string const &Lock) { string const listDir = _config->FindDir("Dir::State::lists"); if (SetupAPTPartialDirectory(_config->FindDir("Dir::State"), listDir, "partial", 0700) == false) - return _error->Errno("Acquire", _("List directory %spartial is missing."), listDir.c_str()); + return _error->Errno("Acquire", _("List directory %s is missing."), (listDir + "partial").c_str()); if (SetupAPTPartialDirectory(_config->FindDir("Dir::State"), listDir, "auxfiles", 0755) == false) - return _error->Errno("Acquire", _("List directory %sauxfiles is missing."), listDir.c_str()); + return _error->Errno("Acquire", _("List directory %s is missing."), (listDir + "auxfiles").c_str()); string const archivesDir = _config->FindDir("Dir::Cache::Archives"); if (SetupAPTPartialDirectory(_config->FindDir("Dir::Cache"), archivesDir, "partial", 0700) == false) - return _error->Errno("Acquire", _("Archives directory %spartial is missing."), archivesDir.c_str()); + return _error->Errno("Acquire", _("Archives directory %s is missing."), (archivesDir + "partial").c_str()); return true; } return GetLock(Lock); @@ -140,17 +140,17 @@ bool pkgAcquire::GetLock(std::string const &Lock) if (Lock == listDir) { if (SetupAPTPartialDirectory(_config->FindDir("Dir::State"), listDir, "partial", 0700) == false) - return _error->Errno("Acquire", _("List directory %spartial is missing."), listDir.c_str()); + return _error->Errno("Acquire", _("List directory %s is missing."), (listDir + "partial").c_str()); } if (Lock == archivesDir) { if (SetupAPTPartialDirectory(_config->FindDir("Dir::Cache"), archivesDir, "partial", 0700) == false) - return _error->Errno("Acquire", _("Archives directory %spartial is missing."), archivesDir.c_str()); + return _error->Errno("Acquire", _("Archives directory %s is missing."), (archivesDir + "partial").c_str()); } if (Lock == listDir || Lock == archivesDir) { if (SetupAPTPartialDirectory(_config->FindDir("Dir::State"), listDir, "auxfiles", 0755) == false) - return _error->Errno("Acquire", _("List directory %sauxfiles is missing."), listDir.c_str()); + return _error->Errno("Acquire", _("List directory %s is missing."), (listDir + "auxfiles").c_str()); } if (_config->FindB("Debug::NoLocking", false) == true) -- cgit v1.2.3