From: Michael Vogt <mvo@ubuntu.com>
Date: Tue, 1 Apr 2014 10:28:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage
X-Git-Tag: 1.0~9^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/be20eef52da4b7f361333ea70a8d705a98ae779e

Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage

Conflicts:
	cmdline/apt.cc
---

be20eef52da4b7f361333ea70a8d705a98ae779e
diff --cc cmdline/apt.cc
index 60a83c7ce,5dbf868d7..b69aeef2d
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@@ -119,9 -108,10 +108,10 @@@ int main(int argc, const char *argv[]
          return 100;
      }
  
-    // FIXME: move into a new libprivate/private-install.cc:Install()
-    _config->Set("DPkgPM::Progress-Fancy", "1");
-    _config->Set("Apt::Color", "1");
+     // some different defaults
 -   _config->CndSet("DPkgPM::Progress", "1");
++   _config->CndSet("DPkgPM::Progress-Fancy", "1");
+    _config->CndSet("Apt::Color", "1");
+    _config->CndSet("APT::Get::Upgrade-Allow-New", true);
  
     // Parse the command line and initialize the package library
     CommandLine CmdL(Args.data(), _config);