Fixed an issue when --upload-port CLI flag does not override declared upload_port option in "platformio.ini"

platformio/builder/main.py

@@ -97,6 +97,7 @@ env.Replace(
         for key in list(clivars.keys()) if key in env
     })
 
+
 if env.subst("$BUILDCACHE_DIR"):
     if not isdir(env.subst("$BUILDCACHE_DIR")):
         makedirs(env.subst("$BUILDCACHE_DIR"))

platformio/builder/tools/pioproject.py

@@ -32,7 +32,8 @@ def GetProjectOption(env, option, default=None):
 def LoadProjectOptions(env):
     for option, value in env.GetProjectOptions():
         option_meta = ProjectOptions.get("env." + option)
-        if not option_meta or not option_meta.buildenvvar:
+        if (not option_meta or not option_meta.buildenvvar
+                or option_meta.buildenvvar in env):
             continue
         env[option_meta.buildenvvar] = value