summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Burrows <Daniel Burrows Daniel_Burrows@alumni.brown.edu>2010-05-25 17:13:22 -0700
committerDaniel Burrows <Daniel Burrows Daniel_Burrows@alumni.brown.edu>2010-05-25 17:13:22 -0700
commit9cfb352853b6ca34671da54ac57a1f80ce25a5d3 (patch)
tree467b7c889bfa85a8e7fc23158c7fe4c7083cb4ce
parente43249fef400221672fc9dc6c7cd59323cd70a8f (diff)
downloadaptitude-9cfb352853b6ca34671da54ac57a1f80ce25a5d3.tar.gz
Merge two "if" statements that have the same consequent.
-rw-r--r--src/cmdline/text_progress.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cmdline/text_progress.cc b/src/cmdline/text_progress.cc
index d8b149f3..5b5cce50 100644
--- a/src/cmdline/text_progress.cc
+++ b/src/cmdline/text_progress.cc
@@ -178,10 +178,8 @@ namespace aptitude
bool hide_tty_decorations = false;
bool hidden = false;
- if(!isatty(1))
- hide_tty_decorations = true;
-
- if(aptcfg->FindI("Quiet", 0))
+ if(!isatty(1) ||
+ aptcfg->FindI("Quiet", 0))
hide_tty_decorations = true;
if(require_tty_decorations && hide_tty_decorations)