diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-13 17:51:34 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-09-13 17:51:34 +0200 |
| commit | 81e17ad558f2e923342725ea48f5f4304fb0d041 (patch) | |
| tree | cb99df81e746dfad6c739473671cd9ad871ee6de | |
| parent | 836c46623ca94c94f2a9118492f163ad1424a267 (diff) | |
* cherry pick r2165 from lp:~donkult/apt/sid:
* 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 | 6 |
2 files changed, 13 insertions, 7 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index df33e8547..41d90b719 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; } diff --git a/debian/changelog b/debian/changelog index a4d19bec6..f2c34beb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,12 @@ apt (0.8.16~exp5ubuntu8) UNRELEASEDoneiric; urgency=low - fix double delete (LP: #848907) - ignore only the invalid regexp instead of all options + * cherry pick r2165 from lp:~donkult/apt/sid: + [ 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) + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2011 16:22:20 +0200 apt (0.8.16~exp5ubuntu7) oneiric; urgency=low |