Fixed an issue when invalid CLI command does not return non-zero exit code

HISTORY.rst

@@ -32,6 +32,7 @@ PlatformIO Core 4.0
 * Fixed default PIO Unified Debugger configuration for `J-Link probe <http://docs.platformio.org/page/plus/debug-tools/jlink.html>`__
 * Fixed an issue with LDF when header files not found if "libdeps_dir" is within a subdirectory of "lib_extra_dirs" (`issue #3311 <https://github.com/platformio/platformio-core/issues/3311>`_)
 * Fixed an issue "Import of non-existent variable 'projenv''" when development platform does not call "env.BuildProgram()" (`issue #3315 <https://github.com/platformio/platformio-core/issues/3315>`_)
+* Fixed an issue when invalid CLI command does not return non-zero exit code
 
 4.1.0 (2019-11-07)
 ~~~~~~~~~~~~~~~~~~

platformio/__main__.py

@@ -100,8 +100,9 @@ def main(argv=None):
     try:
         configure()
         cli()  # pylint: disable=no-value-for-parameter
-    except SystemExit:
-        pass
+    except SystemExit as e:
+        if e.code and str(e.code).isdigit():
+            exit_code = int(e.code)
     except Exception as e:  # pylint: disable=broad-except
         if not isinstance(e, exception.ReturnErrorCode):
             maintenance.on_platformio_exception(e)

tests/package/test_manifest.py

@@ -69,7 +69,7 @@ def test_library_json_parser():
                 {"name": "deps2", "version": "https://github.com/username/package.git"},
             ],
             "customField": "Custom Value",
-        }
+        },
     )
 
     contents = """