Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

Conflicts:
	test/integration/test-apt-get-download

diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 2ae112af464e0b609a38084b1e0516c35f99e54f..420ca14d59b89ddc23f1f1587e42d603630b3496 100644 (file)
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -30,6 +30,9 @@ unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */
 
 bool InitOutput()                                                      /*{{{*/
 {
+   if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
+      _config->Set("quiet","1");
+
    c0out.rdbuf(cout.rdbuf());
    c1out.rdbuf(cout.rdbuf());
    c2out.rdbuf(cout.rdbuf());

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 2a9964722093d1495bf20f66bfa41287da2f1367..4d609104ceb252eae31be4c1335a3b079d80fc10 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1736,10 +1736,6 @@ int main(int argc,const char *argv[])                                    /*{{{*/
    // see if we are in simulate mode
    CheckSimulateMode(CmdL);
 
-   // Deal with stdout not being a tty
-   if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
-      _config->Set("quiet","1");
-
    // Setup the output streams
    InitOutput();
 

diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 6fe25e3f39f0336fbae59df2dda88717eaf5dd45..6ad470faa42202d0ee45b1074a3e0789e6dd35cc 100644 (file)
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -156,8 +156,6 @@ int main(int argc, const char *argv[])                                      /*{{{*/
                 << std::endl
                 << std::endl;
    }
-   if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
-      _config->Set("quiet","1");
 
    // See if the help should be shown
    if (_config->FindB("help") == true ||

diff --git a/test/integration/test-apt-cli-upgrade b/test/integration/test-apt-cli-upgrade
index 163a555765da55e8c13e41e62e782ed5a71f5eec..21ce6941339f2116d70abceac49bcf28de4fe9f0 100755 (executable)
--- a/test/integration/test-apt-cli-upgrade
+++ b/test/integration/test-apt-cli-upgrade
@@ -16,8 +16,7 @@ setupaptarchive
 APTARCHIVE=$(readlink -f ./aptarchive)
 
 # default is to allow new dependencies
-testequal "Calculating upgrade... Done
-The following NEW packages will be installed:
+testequal "The following NEW packages will be installed:
   foo-new-dependency
 The following packages will be upgraded:
   foo
@@ -28,7 +27,6 @@ Conf foo-new-dependency (2.0 unstable [all])
 Conf foo (2.0 unstable [all])" apt upgrade -qq -s
 
 # ensure 
-testequal "Calculating upgrade... Done
-The following packages have been kept back:
+testequal "The following packages have been kept back:
   foo
 0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded." apt upgrade -qq -s --no-new-pkgs

diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download
index ec809e0ce84b9fcaa6caeec0092d187b4a3d7536..7cce6ef2906d36d5d334cede9f81606e2af09c5e 100755 (executable)
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@ -44,3 +44,8 @@ rm -f apt_1.0_all.deb apt_2.0_all.deb
 # deb:738103
 testsuccess aptget download apt apt apt/unstable apt=2.0
 testsuccess test -s apt_2.0_all.deb
+
+# deb:738103 - apt-get download foo foo fails
+rm -f apt_*.deb
+aptget download apt apt
+testsuccess test -s apt_2.0_all.deb