diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-05-05 11:21:13 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-05-05 11:21:13 +0200 |
| commit | a2ec4d22dd77a363cd5b1f8b55ed34ba88331396 (patch) | |
| tree | 1f4995e44a20923ecc69c3ed30ec788d38b81b49 /cmdline | |
| parent | 5c92e3800d6ce8e9cde1e2816bd76c975d9342a7 (diff) | |
| parent | 549da1a850f0fd50e0a55415452ecaa735d49451 (diff) | |
merged from debian
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-cache.cc | 4 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index c0655da40..f10ea48be 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -244,7 +244,7 @@ bool DumpPackage(CommandLine &CmdL) bool Stats(CommandLine &Cmd) { pkgCache &Cache = *GCache; - cout << _("Total package names : ") << Cache.Head().PackageCount << " (" << + cout << _("Total package names: ") << Cache.Head().PackageCount << " (" << SizeToStr(Cache.Head().PackageCount*Cache.Head().PackageSz) << ')' << endl; int Normal = 0; @@ -292,7 +292,7 @@ bool Stats(CommandLine &Cmd) cout << _("Total distinct versions: ") << Cache.Head().VersionCount << " (" << SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl; - cout << _("Total Distinct Descriptions: ") << Cache.Head().DescriptionCount << " (" << + cout << _("Total distinct descriptions: ") << Cache.Head().DescriptionCount << " (" << SizeToStr(Cache.Head().DescriptionCount*Cache.Head().DescriptionSz) << ')' << endl; cout << _("Total dependencies: ") << Cache.Head().DependsCount << " (" << SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index cabbde5cb..278404938 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1374,8 +1374,9 @@ bool DoUpdate(CommandLine &CmdL) // do the work CacheFile Cache; - bool res = ListUpdate(Stat, List); - + if (_config->FindB("APT::Get::Download",true) == true) + ListUpdate(Stat, List); + // Rebuild the cache. if (Cache.BuildCaches() == false) return false; @@ -2653,7 +2654,7 @@ bool ShowHelp(CommandLine &CmdL) " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" - " autoremove - Remove all automatic unused packages\n" + " autoremove - Remove automatically all unused packages\n" " purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" |