summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2008-04-20 08:26:18 -0700
committerDaniel Burrows <dburrows@debian.org>2008-04-20 08:26:18 -0700
commitd619dbb42f749f085809f1219d03d8fab885eedc (patch)
treee8e34d2275b7c7d6ae983bb0d2db48ce2e78a41d
parent92103fbc745a2798633d7724145c8df4577a3684 (diff)
downloadaptitude-d619dbb42f749f085809f1219d03d8fab885eedc.tar.gz
Make the new logic for "quiet" not override "-q" either (Closes: #476749).
-rw-r--r--src/main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cc b/src/main.cc
index bf362bdc..4efdc0de 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -537,10 +537,10 @@ int main(int argc, char *argv[])
}
int curr_quiet = aptcfg->FindI("quiet", 0);
+ if(seen_quiet)
+ aptcfg->SetNoUser("quiet", quiet);
if(quiet == 0 && !isatty(1))
aptcfg->SetNoUser("quiet", std::max(curr_quiet, 1));
- else if(seen_quiet)
- aptcfg->SetNoUser("quiet", quiet);
if(simulate)
aptcfg->SetNoUser(PACKAGE "::Simulate", true);