Просмотр исходного кода

* 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 лет назад: 15
Родитель
Сommit
84cdd603b8
2 измененных файлов с 16 добавлено и 7 удалено
  1. 7 7
      cmdline/apt-get.cc
  2. 9 0
      debian/changelog

+ 7 - 7
cmdline/apt-get.cc

@@ -657,22 +657,22 @@ public:
 					pkgCache::PkgIterator Pkg = I.OwnerPkg();
 					pkgCache::PkgIterator Pkg = I.OwnerPkg();
 
 
 					if (Cache[Pkg].CandidateVerIter(Cache) == I.OwnerVer()) {
 					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;
 						++provider;
 					}
 					}
 				}
 				}
 				// if we found no candidate which provide this package, show non-candidates
 				// if we found no candidate which provide this package, show non-candidates
 				if (provider == 0)
 				if (provider == 0)
 					for (I = Pkg.ProvidesList(); I.end() == false; ++I)
 					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;
 						    << _(" [Not candidate version]") << endl;
 				else
 				else
 					out << _("You should explicitly select one to install.") << endl;
 					out << _("You should explicitly select one to install.") << endl;
 			} else {
 			} else {
-				ioprintf(out,
+				ioprintf(c1out,
 					_("Package %s is not available, but is referred to by another package.\n"
 					_("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"
 					  "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());
 					  "is only available from another source\n"),Pkg.FullName(true).c_str());
@@ -691,9 +691,9 @@ public:
 					List += Dep.ParentPkg().FullName(true) + " ";
 					List += Dep.ParentPkg().FullName(true) + " ";
 					//VersionsList += string(Dep.ParentPkg().CurVersion) + "\n"; ???
 					//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;
 	}
 	}

+ 9 - 0
debian/changelog

@@ -1,3 +1,12 @@
+apt (0.8.15.8) UNRELEASED; 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
 apt (0.8.15.7) unstable; urgency=low
 
 
   [ David Kalnischkies ]
   [ David Kalnischkies ]