summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2008-12-09 17:49:46 -0800
committerMichael Vogt <michael.vogt@ubuntu.com>2008-12-09 17:49:46 -0800
commitde4e6f6b78154cf2c4afea4aea74b5bca3fba96f (patch)
tree2759f5959ce15112935a2e9d22e6395e8b0ddd71 /cmdline/apt-get.cc
parentf23153d046f014f96d442fca5b9ef6ede7fcf546 (diff)
parent3205e1f3b0dc9310fe767aef23824d0deb7a26bf (diff)
merged from the debian-sid branch
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc3
1 files changed, 3 insertions, 0 deletions
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},