* 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)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index df33e8547d32ebba2ff491a0bdffb3672f431d10..41d90b71917aa8ffdee8f81204b01a2540f34ccd 100644 (file)
--- 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()) {
                                        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)
                                                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)
                                                ++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 {
                                                    << _(" [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());
                                        _("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"; ???
                                }
                                        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;
        }
                }
                return false;
        }

diff --git a/debian/changelog b/debian/changelog
index a4d19bec66acc4599aade79d9f3caaf554956de7..f2c34beb3f1daee442de628c7552eb5f5d975486 100644 (file)
--- 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
 
     - 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
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Sep 2011 16:22:20 +0200
 
 apt (0.8.16~exp5ubuntu7) oneiric; urgency=low