diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-12-09 17:49:46 -0800 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-12-09 17:49:46 -0800 |
| commit | de4e6f6b78154cf2c4afea4aea74b5bca3fba96f (patch) | |
| tree | 2759f5959ce15112935a2e9d22e6395e8b0ddd71 /cmdline | |
| parent | f23153d046f014f96d442fca5b9ef6ede7fcf546 (diff) | |
| parent | 3205e1f3b0dc9310fe767aef23824d0deb7a26bf (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-cache.cc | 4 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 3 | ||||
| -rwxr-xr-x | cmdline/apt-key | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 11bc4fe03..425df6994 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1744,8 +1744,8 @@ bool ShowHelp(CommandLine &Cmd) " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" - " pkgnames - List the names of all packages\n" - " dotty - Generate package graphs for GraphVis\n" + " pkgnames - List the names of all packages in the system\n" + " dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2ef32a615..4dbc4873f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1721,6 +1721,7 @@ bool DoInstall(CommandLine &CmdL) "requested an impossible situation or if you are using the unstable\n" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming.") << endl; + /* if (Packages == 1) { c1out << endl; @@ -1729,6 +1730,7 @@ bool DoInstall(CommandLine &CmdL) "the package is simply not installable and a bug report against\n" "that package should be filed.") << endl; } + */ c1out << _("The following information may help to resolve the situation:") << endl; c1out << endl; @@ -2730,6 +2732,7 @@ int main(int argc,const char *argv[]) {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, {0,"auto-remove","APT::Get::AutomaticRemove",0}, + {0,"build-dep-automatic","APT::Get::Build-Dep-Automatic",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, {0,"fix-policy","APT::Get::Fix-Policy-Broken",0}, diff --git a/cmdline/apt-key b/cmdline/apt-key index 51a0bc2d1..7bb30240e 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -1,6 +1,7 @@ #!/bin/sh set -e +unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available |