summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-06-01 13:51:21 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-06-01 13:51:21 +0000
commiteb0a335ea298ae7901af2036156243b38d5027cf (patch)
tree8d6d3c104be4d4a747ddb74fa6ba062673a93ea8
parent42ab8223d52672cf28c6e2e574bb364c438bd49a (diff)
* added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/
-rw-r--r--apt-pkg/depcache.cc1
-rw-r--r--cmdline/apt-cache.cc14
-rw-r--r--debian/changelog7
3 files changed, 1 insertions, 21 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index c6bf3185a..240ad4da2 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -91,6 +91,7 @@ bool pkgDepCache::Init(OpProgress *Prog)
}
Update(Prog);
+ Prog->Done();
return true;
}
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 3bd1435fc..0014563b8 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1360,20 +1360,6 @@ bool ShowPackage(CommandLine &CmdL)
++found;
- // Show virtual packages
- if (Pkg->ProvidesList != 0)
- {
- ioprintf(std::cout,_("Package %s is a virtual package provided by:\n"),
- Pkg.Name());
-
- pkgCache::PrvIterator I = Pkg.ProvidesList();
- for (; I.end() == false; I++)
- cout << " " << I.OwnerPkg().Name() << endl;
- cout << _("You should explicitly select one to show.") << endl;
- continue;
- }
-
-
// Find the proper version to use.
if (_config->FindB("APT::Cache::AllVersions","true") == true)
{
diff --git a/debian/changelog b/debian/changelog
index d2b896369..681684daa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
apt (0.6.37) breezy; urgency=low
- * apt-cache show <virtualpkg> shows the available packages providing
- the virtual pkg (thanks to otavio) (closes: #202493)
* make pinning on the "component" work again (using the section of the
archive, we don't use per-section Release files anymore with apt-0.6)
(closes ubuntu #9935)
@@ -23,7 +21,6 @@ apt (0.6.36ubuntu1) breezy; urgency=low
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 23 May 2005 11:57:53 +0200
->>>>>>> MERGE-SOURCE
apt (0.6.36) experimental; urgency=low
* Merge apt--mvo--0:
@@ -35,11 +32,7 @@ apt (0.6.36) experimental; urgency=low
- apt-pkg/cdrom.cc:
honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
-<<<<<<< TREE
- -- Michael Vogt <mvo@debian.org> Fri, 6 May 2005 10:12:20 +0200
-=======
-- Michael Vogt <mvo@debian.org> Thu, 31 Mar 2005 20:37:11 +0200
->>>>>>> MERGE-SOURCE
apt (0.6.35) hoary; urgency=low