diff options
Diffstat (limited to 'src/cmdline/cmdline_action.cc')
| -rw-r--r-- | src/cmdline/cmdline_action.cc | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/cmdline/cmdline_action.cc b/src/cmdline/cmdline_action.cc index 8fa2eb62..4a8393cb 100644 --- a/src/cmdline/cmdline_action.cc +++ b/src/cmdline/cmdline_action.cc @@ -246,15 +246,19 @@ bool cmdline_applyaction(cmdline_pkgaction_type action, if(prv.OwnerPkg().CurrentVer()==prv.OwnerVer()) { if(verbose>0) - printf(_("Note: \"%s\", providing the virtual package\n \"%s\", is already installed.\n"), - prv.OwnerPkg().FullName(true).c_str(), pkg.Name()); + printf(_("Note: \"%s\", providing the virtual package\n" + " \"%s\", is already installed.\n"), + prv.OwnerPkg().FullName(true).c_str(), + pkg.FullName(true).c_str()); return true; } else if((*apt_cache_file)[prv.OwnerPkg()].InstVerIter(*apt_cache_file)==prv.OwnerVer()) { if(verbose>0) - printf(_("Note: \"%s\", providing the virtual package\n \"%s\", is already going to be installed.\n"), - prv.OwnerPkg().FullName(true).c_str(), pkg.Name()); + printf(_("Note: \"%s\", providing the virtual package\n" + " \"%s\", is already going to be installed.\n"), + prv.OwnerPkg().FullName(true).c_str(), + pkg.FullName(true).c_str()); return true; } } @@ -275,8 +279,9 @@ bool cmdline_applyaction(cmdline_pkgaction_type action, if(cands.size()==0) { if(!seen_in_first_pass) - printf(_("\"%s\" exists in the package database, but it is not a\nreal package and no package provides it.\n"), - pkg.Name()); + printf(_("\"%s\" exists in the package database, but it is not a\n" + "real package and no package provides it.\n"), + pkg.FullName(true).c_str()); return false; } else if(cands.size()>1) @@ -284,7 +289,7 @@ bool cmdline_applyaction(cmdline_pkgaction_type action, if(!seen_in_first_pass) { printf(_("\"%s\" is a virtual package provided by:\n"), - pkg.Name()); + pkg.FullName(true).c_str()); cmdline_show_pkglist(cands, term_metrics); printf(_("You must choose one to install.\n")); } @@ -294,8 +299,10 @@ bool cmdline_applyaction(cmdline_pkgaction_type action, { if(!seen_in_first_pass) { - printf(_("Note: selecting \"%s\" instead of the\n virtual package \"%s\"\n"), - cands[0].FullName(true).c_str(), pkg.Name()); + printf(_("Note: selecting \"%s\" instead of the\n" + "virtual package \"%s\"\n"), + cands[0].FullName(true).c_str(), + pkg.FullName(true).c_str()); } pkg = cands[0]; } |