From b7b01dd6a0ca2b073ce349c7360661be05238efa Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 3 Aug 2022 16:35:37 +0300
Subject: [PATCH] Drop "pio --force" option

---
 platformio/__main__.py    | 4 ++--
 platformio/app.py         | 2 --
 platformio/commands/ci.py | 4 +---
 platformio/maintenance.py | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/platformio/__main__.py b/platformio/__main__.py
index 6a1cda94..c0ad38ac 100644
--- a/platformio/__main__.py
+++ b/platformio/__main__.py
@@ -31,7 +31,7 @@ from platformio.compat import IS_CYGWIN, ensure_python3
 @click.option("--caller", "-c", help="Caller ID (service)")
 @click.option("--no-ansi", is_flag=True, help="Do not print ANSI control characters")
 @click.pass_context
-def cli(ctx, force, caller, no_ansi):
+def cli(ctx, force, caller, no_ansi):  # pylint: disable=unused-argument
     try:
         if (
             no_ansi
@@ -53,7 +53,7 @@ def cli(ctx, force, caller, no_ansi):
     except:  # pylint: disable=bare-except
         pass
 
-    maintenance.on_platformio_start(ctx, force, caller)
+    maintenance.on_platformio_start(ctx, caller)
 
 
 @cli.result_callback()
diff --git a/platformio/app.py b/platformio/app.py
index 75035b57..8315be3c 100644
--- a/platformio/app.py
+++ b/platformio/app.py
@@ -62,7 +62,6 @@ DEFAULT_SETTINGS = {
 
 SESSION_VARS = {
     "command_ctx": None,
-    "force_option": False,
     "caller_id": None,
     "custom_project_conf": None,
 }
@@ -229,7 +228,6 @@ def set_session_var(name, value):
 def is_disabled_progressbar():
     return any(
         [
-            get_session_var("force_option"),
             proc.is_ci(),
             os.getenv("PLATFORMIO_DISABLE_PROGRESSBAR") == "true",
         ]
diff --git a/platformio/commands/ci.py b/platformio/commands/ci.py
index e62d1ca9..aebd9e7b 100644
--- a/platformio/commands/ci.py
+++ b/platformio/commands/ci.py
@@ -19,7 +19,7 @@ import tempfile
 
 import click
 
-from platformio import app, fs
+from platformio import fs
 from platformio.exception import CIBuildEnvsEmpty
 from platformio.project.commands.init import project_init_cmd, validate_boards
 from platformio.project.config import ProjectConfig
@@ -84,8 +84,6 @@ def cli(  # pylint: disable=too-many-arguments, too-many-branches
         raise click.BadParameter("Missing argument 'src'")
 
     try:
-        app.set_session_var("force_option", True)
-
         if not keep_build_dir and os.path.isdir(build_dir):
             fs.rmtree(build_dir)
         if not os.path.isdir(build_dir):
diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index bd9ccd9f..304ebc4a 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -32,9 +32,8 @@ from platformio.package.version import pepver_to_semver
 from platformio.system.prune import calculate_unnecessary_system_data
 
 
-def on_platformio_start(ctx, force, caller):
+def on_platformio_start(ctx, caller):
     app.set_session_var("command_ctx", ctx)
-    app.set_session_var("force_option", force)
     set_caller(caller)
     telemetry.on_command()