darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Enhance ReInstall error diagnostics (ALT#24044)

Browse Source
This commit is contained in:
Дмитрий Левин 2011-02-13 13:23:58 +00:00
parent 57c0417fcd
commit e1aab96204
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apt/cmdline/apt-get.cc
View File

@ -1428,9 +1428,12 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
{ {
if (_config->FindB("APT::Get::ReInstall",false) == true) if (_config->FindB("APT::Get::ReInstall",false) == true)
{ {
if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) if (Pkg->CurrentVer == 0)
ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), ioprintf(c1out,_("Reinstallation of %s is not possible.\n"),
Pkg.Name()); Pkg.Name());
else if (Pkg.CurrentVer().Downloadable() == false)
ioprintf(c1out,_("Reinstallation of %s %s is not possible, it cannot be downloaded.\n"),
Pkg.Name(), Pkg.CurrentVer().VerStr());
else else
Cache.SetReInstall(Pkg,true); Cache.SetReInstall(Pkg,true);
} }

7
apt/cmdline/apt-shell.cc
View File

@ -1504,9 +1504,12 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
{ {
if (_config->FindB("APT::Get::ReInstall",false) == true) if (_config->FindB("APT::Get::ReInstall",false) == true)
{ {
if (Pkg->CurrentVer == 0 || Pkg.CurrentVer().Downloadable() == false) if (Pkg->CurrentVer == 0)
ioprintf(c1out,_("Reinstallation of %s is not possible, it cannot be downloaded.\n"), ioprintf(c1out,_("Reinstallation of %s is not possible.\n"),
Pkg.Name()); Pkg.Name());
else if (Pkg.CurrentVer().Downloadable() == false)
ioprintf(c1out,_("Reinstallation of %s %s is not possible, it cannot be downloaded.\n"),
Pkg.Name(), Pkg.CurrentVer().VerStr());
else else
Cache.SetReInstall(Pkg,true); Cache.SetReInstall(Pkg,true);
} }

9
apt/po/ru.po
View File

@ -789,8 +789,13 @@ msgstr "
#: cmdline/apt-get.cc:1432 cmdline/apt-shell.cc:1507 #: cmdline/apt-get.cc:1432 cmdline/apt-shell.cc:1507
#, c-format #, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgid "Reinstallation of %s is not possible.\n"
msgstr "Переустановить %s невозможно, потому что этот пакет нельзя скачать.\n" msgstr "ðÅÒÅÕÓÔÁÎÏ×ÉÔØ %s ÎÅ×ÏÚÍÏÖÎÏ.\n"
#: cmdline/apt-get.cc:1432 cmdline/apt-shell.cc:1507
#, c-format
msgid "Reinstallation of %s-%s is not possible, it cannot be downloaded.\n"
msgstr "ðÅÒÅÕÓÔÁÎÏ×ÉÔØ %s-%s ÎÅ×ÏÚÍÏÖÎÏ, ÐÏÔÏÍÕ ÞÔÏ ÜÔÏÔ ÐÁËÅÔ ÎÅÌØÚÑ ÓËÁÞÁÔØ.\n"
#: cmdline/apt-get.cc:1440 cmdline/apt-shell.cc:1515 #: cmdline/apt-get.cc:1440 cmdline/apt-shell.cc:1515
#, c-format #, c-format