diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-30 13:48:05 -0500 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-30 13:48:05 -0500 |
| commit | 89d88ac3ef3f82fdfeac6d8d231deddeeb0f02e9 (patch) | |
| tree | 258687a5f0984f0b4edd24b52d778cf4d21c7059 /cmdline/apt-get.cc | |
| parent | cd5e84440a9bb75a9cc2c142ac8bc214ba57685a (diff) | |
| parent | 0a64ecd792b4caca519d597a69b8baeda6a1bf77 (diff) | |
merge with my debian-sid branch
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 88e734697..1925dea87 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -662,22 +662,22 @@ public: pkgCache::PkgIterator Pkg = I.OwnerPkg(); if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) { - out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); + c1out << " " << Pkg.FullName(true) << " " << I.OwnerVer().VerStr(); if (Cache[Pkg].Install() == true && Cache[Pkg].NewInstall() == false) - out << _(" [Installed]"); - out << endl; + c1out << _(" [Installed]"); + c1out << endl; ++provider; } } // if we found no candidate which provide this package, show non-candidates if (provider == 0) for (I = Pkg.ProvidesList(); I.end() == false; ++I) - out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() + c1out << " " << I.OwnerPkg().FullName(true) << " " << I.OwnerVer().VerStr() << _(" [Not candidate version]") << endl; else out << _("You should explicitly select one to install.") << endl; } else { - ioprintf(out, + ioprintf(c1out, _("Package %s is not available, but is referred to by another package.\n" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n"),Pkg.FullName(true).c_str()); @@ -696,9 +696,9 @@ public: List += Dep.ParentPkg().FullName(true) + " "; //VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ??? } - ShowList(out,_("However the following packages replace it:"),List,VersionsList); + ShowList(c1out,_("However the following packages replace it:"),List,VersionsList); } - out << std::endl; + c1out << std::endl; } return false; } |