From 6e5198f3739f536935916f700bd09a9f96ad0278 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 2 Sep 2020 18:49:00 +0300
Subject: [PATCH] Minor improvements

---
 platformio/builder/main.py               | 2 +-
 platformio/package/exception.py          | 2 +-
 platformio/package/manager/_install.py   | 2 +-
 platformio/package/manager/_uninstall.py | 8 +++++---
 tests/commands/test_platform.py          | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index e73f6869..1547cf99 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -160,7 +160,7 @@ env.LoadPioPlatform()
 
 env.SConscriptChdir(0)
 env.SConsignFile(
-    join("$BUILD_DIR", ".sconsign%d%d.db" % (sys.version_info[0], sys.version_info[1]))
+    join("$BUILD_DIR", ".sconsign%d%d" % (sys.version_info[0], sys.version_info[1]))
 )
 
 for item in env.GetExtraScripts("pre"):
diff --git a/platformio/package/exception.py b/platformio/package/exception.py
index 0f34592f..5d63649e 100644
--- a/platformio/package/exception.py
+++ b/platformio/package/exception.py
@@ -55,7 +55,7 @@ class MissingPackageManifestError(ManifestException):
 class UnknownPackageError(UserSideException):
 
     MESSAGE = (
-        "Could not find a package with '{0}' requirements for your system '%s'"
+        "Could not find the package with '{0}' requirements for your system '%s'"
         % util.get_systype()
     )
 
diff --git a/platformio/package/manager/_install.py b/platformio/package/manager/_install.py
index 1a83d65b..9d82d6fe 100644
--- a/platformio/package/manager/_install.py
+++ b/platformio/package/manager/_install.py
@@ -106,7 +106,7 @@ class PackageManagerInstallMixin(object):
 
         if not silent:
             self.print_message(
-                "{name} @ {version} has been successfully installed!".format(
+                "{name} @ {version} has been installed!".format(
                     **pkg.metadata.as_dict()
                 ),
                 fg="green",
diff --git a/platformio/package/manager/_uninstall.py b/platformio/package/manager/_uninstall.py
index 322eced6..68f7a300 100644
--- a/platformio/package/manager/_uninstall.py
+++ b/platformio/package/manager/_uninstall.py
@@ -37,9 +37,8 @@ class PackageManagerUninstallMixin(object):
 
         if not silent:
             self.print_message(
-                "Removing %s @ %s: \t"
+                "Removing %s @ %s"
                 % (click.style(pkg.metadata.name, fg="cyan"), pkg.metadata.version),
-                nl=False,
             )
 
         # firstly, remove dependencies
@@ -68,7 +67,10 @@ class PackageManagerUninstallMixin(object):
             self.memcache_reset()
 
         if not silent:
-            click.echo("[%s]" % click.style("OK", fg="green"))
+            self.print_message(
+                "{name} @ {version} has been removed!".format(**pkg.metadata.as_dict()),
+                fg="green",
+            )
 
         return pkg
 
diff --git a/tests/commands/test_platform.py b/tests/commands/test_platform.py
index 39afbeb5..cfb7fe31 100644
--- a/tests/commands/test_platform.py
+++ b/tests/commands/test_platform.py
@@ -119,7 +119,7 @@ def test_update_check(clirunner, validate_cliresult, isolated_pio_core):
 def test_update_raw(clirunner, validate_cliresult, isolated_pio_core):
     result = clirunner.invoke(cli_platform.platform_update)
     validate_cliresult(result)
-    assert "Removing atmelavr @ 2.0.0:" in result.output
+    assert "Removing atmelavr @ 2.0.0" in result.output
     assert "Platform Manager: Installing platformio/atmelavr @" in result.output
     assert len(isolated_pio_core.join("packages").listdir()) == 2