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

apt-get, apt-shell: print (un)resolved package diagnostics consistently (ALT#27364)

Browse Source 
When a package could not be found, print the unmangled string passed to
the utility.  Based on patch by Igor Vlasenko.
This commit is contained in:
Дмитрий Левин 2012-05-24 14:54:05 +00:00
parent f8fdaed2ec
commit 7f7e8d7b6b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1995,7 +1995,7 @@ bool DoInstall(CommandLine &CmdL)
if (Hit == true) if (Hit == true)
continue; continue;
#endif #endif
return _error->Error(_("Couldn't find package %s"),S); return _error->Error(_("Couldn't find package %s"), OrigS);
} }
// Regexs must always be confirmed // Regexs must always be confirmed
@ -2021,7 +2021,7 @@ bool DoInstall(CommandLine &CmdL)
// CNC:2003-11-23 // CNC:2003-11-23
ioprintf(c1out,_("Selecting %s for '%s'\n"), ioprintf(c1out,_("Selecting %s for '%s'\n"),
Pkg.Name(),S); Pkg.Name(), OrigS);
if (VerTag != 0) if (VerTag != 0)
// CNC:2003-11-05 // CNC:2003-11-05
@ -2034,7 +2034,7 @@ bool DoInstall(CommandLine &CmdL)
regfree(&Pattern); regfree(&Pattern);
if (Hit == false) if (Hit == false)
return _error->Error(_("Couldn't find package %s"),S); return _error->Error(_("Couldn't find package %s"), OrigS);
} }
else else
{ {

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

@ -2065,7 +2065,7 @@ bool DoInstall(CommandLine &CmdL)
if (Hit == true) if (Hit == true)
continue; continue;
#endif #endif
return _error->Error(_("Couldn't find package %s"),S); return _error->Error(_("Couldn't find package %s"), OrigS);
} }
// Regexs must always be confirmed // Regexs must always be confirmed
@ -2091,7 +2091,7 @@ bool DoInstall(CommandLine &CmdL)
// CNC:2003-11-23 // CNC:2003-11-23
ioprintf(c1out,_("Selecting %s for '%s'\n"), ioprintf(c1out,_("Selecting %s for '%s'\n"),
Pkg.Name(),S); Pkg.Name(), OrigS);
StateGuard->Ignore(Pkg); StateGuard->Ignore(Pkg);
if (VerTag != 0) if (VerTag != 0)
@ -2105,7 +2105,7 @@ bool DoInstall(CommandLine &CmdL)
regfree(&Pattern); regfree(&Pattern);
if (Hit == false) if (Hit == false)
return _error->Error(_("Couldn't find package %s"),S); return _error->Error(_("Couldn't find package %s"), OrigS);
} }
else else
{ {