summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Burrows <dburrows@debian.org>2011-07-23 15:10:50 -0700
committerDaniel Burrows <dburrows@debian.org>2011-07-23 15:10:50 -0700
commit0eb3c8672f554258bf19ff4aca9d610f2ee7da97 (patch)
tree765225b67bfae7af2ea05c6e4501b777b4c00568 /src
parent9ec1b4c35b1a1e741a30e62c9f8e2bc21e18aecc (diff)
downloadaptitude-0eb3c8672f554258bf19ff4aca9d610f2ee7da97.tar.gz
Strip out unused code that tracks whether some options were set.
While the intention is admirable, the fact is that this code isn't used and I don't have time today to use it.
Diffstat (limited to 'src')
-rw-r--r--src/main.cc11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/main.cc b/src/main.cc
index 81432fda..07fb20d6 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -663,13 +663,6 @@ int main(int argc, char *argv[])
bool disable_columns = aptcfg->FindB(PACKAGE "::CmdLine::Disable-Columns", false);
- // This tracks whether we got a --*-new-installs command-line
- // argument, so we can present a useful warning message to the user
- // if it's not applicable.
- bool saw_new_installs_option = false;
- // Same for --*-new-upgrades
- bool saw_new_upgrades_option = false;
-
bool showvers=aptcfg->FindB(PACKAGE "::CmdLine::Show-Versions", false);
bool showdeps=aptcfg->FindB(PACKAGE "::CmdLine::Show-Deps", false);
bool showsize=aptcfg->FindB(PACKAGE "::CmdLine::Show-Size-Changes", false);
@@ -845,19 +838,15 @@ int main(int argc, char *argv[])
break;
case OPTION_NO_NEW_INSTALLS:
safe_resolver_no_new_installs = true;
- saw_new_installs_option = true;
break;
case OPTION_ALLOW_NEW_INSTALLS:
safe_resolver_no_new_installs = false;
- saw_new_installs_option = true;
break;
case OPTION_NO_NEW_UPGRADES:
safe_resolver_no_new_upgrades = true;
- saw_new_upgrades_option = false;
break;
case OPTION_ALLOW_NEW_UPGRADES:
safe_resolver_no_new_upgrades = false;
- saw_new_upgrades_option = false;
break;
case OPTION_SAFE_RESOLVER:
resolver_mode = resolver_mode_safe;