diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-13 17:39:57 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-13 17:39:57 +0200 |
| commit | 4fe19044a7102f20c62f2f223d5624106f50ddb6 (patch) | |
| tree | f708e32cb4a46397f70c218ad519450c6454a443 | |
| parent | 4e9108b8238438f1c390cb9ea9de598de1b7d7cb (diff) | |
* cmdline/apt-get.cc:
- output list of virtual package providers to c1out in -q=1
instead of /dev/null to unbreak sbuild (LP: #816155)
| -rw-r--r-- | cmdline/apt-get.cc | 14 | ||||
| -rw-r--r-- | debian/changelog | 9 |
2 files changed, 16 insertions, 7 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 69b9dcda9..9096f263f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -657,22 +657,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()); @@ -691,9 +691,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; } diff --git a/debian/changelog b/debian/changelog index eaecb1aa1..32b7e9008 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.8.15.8) unstable; urgency=low + + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - output list of virtual package providers to c1out in -q=1 + instead of /dev/null to unbreak sbuild (LP: #816155) + + -- David Kalnischkies <kalnischkies@gmail.com> Tue, 13 Sep 2011 17:39:10 +0200 + apt (0.8.15.7) unstable; urgency=low [ David Kalnischkies ] |