fix: Do not show success with failed dependencies install (#3062)

* fix: Do not show success with failed dependencies install and do not override mshtml

* fix: Return bool instead of Result for create_bottle_from_config()

bottles/backend/managers/dependency.py

@@ -51,7 +51,7 @@ def __init__(self, manager, offline: bool = False):
         self.__utils_conn = manager.utils_conn
 
     @lru_cache
-    def get_dependency(self, name: str, plain: bool = False) -> Union[str, dict]:
+    def get_dependency(self, name: str, plain: bool = False) -> Union[str, dict, bool]:
         return self.__repo.get(name, plain)
 
     @lru_cache

bottles/backend/managers/manager.py

@@ -1063,8 +1063,10 @@ def create_bottle_from_config(self, config: BottleConfig) -> bool:
             '''
             if dependency in self.supported_dependencies.keys():
                 dep = [dependency, self.supported_dependencies[dependency]]
-                self.dependency_manager.install(config, dep)
-
+                res = self.dependency_manager.install(config, dep)
+                if not res.ok:
+                    logging.error(_("Failed to install dependency: %s") % dep.get("Description", "n/a"), jn=True)
+                    return False
         logging.info(f"New bottle from config created: {config.Path}")
         self.update_bottles(silent=True)
         return True
@@ -1314,7 +1316,7 @@ def components_check():
             # blacklisting processes
             logging.info("Optimizing environment…")
             log_update(_("Optimizing environment…"))
-            _blacklist_dll = ["winemenubuilder.exe", "mshtml"]  # avoid gecko, mono popups
+            _blacklist_dll = ["winemenubuilder.exe"]
             for _dll in _blacklist_dll:
                 reg.add(
                     key="HKEY_CURRENT_USER\\Software\\Wine\\DllOverrides",
@@ -1381,7 +1383,11 @@ def components_check():
                 if dep in self.supported_dependencies:
                     _dep = self.supported_dependencies[dep]
                     log_update(_("Installing dependency: %s …") % _dep.get("Description", "n/a"))
-                    self.dependency_manager.install(config, [dep, _dep])
+                    res = self.dependency_manager.install(config, [dep, _dep])
+                    if not res.ok:
+                        logging.error(_("Failed to install dependency: %s") % _dep.get("Description", "n/a"), jn=True)
+                        log_update(_("Failed to install dependency: %s") % _dep.get("Description", "n/a"))
+                        return Result(False)
                     template_updated = True
 
         # save bottle config

bottles/backend/repos/repo.py

@@ -16,6 +16,7 @@
 #
 
 from io import BytesIO
+from typing import Union
 
 import pycurl
 
@@ -62,7 +63,7 @@ def __get_catalog(self, index: str, offline: bool = False):
             logging.error(f"Cannot fetch {self.name} repository index.")
             return {}
 
-    def get_manifest(self, url: str, plain: bool = False):
+    def get_manifest(self, url: str, plain: bool = False) -> Union[str, dict, bool]:
         try:
             buffer = BytesIO()
 
@@ -81,4 +82,4 @@ def get_manifest(self, url: str, plain: bool = False):
             return yaml.load(res)
         except (pycurl.error, yaml.YAMLError):
             logging.error(f"Cannot fetch {self.name} manifest.")
-            return {}
+            return False

bottles/backend/wine/winecommand.py

@@ -201,8 +201,6 @@ def get_env(self, environment: Optional[dict] = None, return_steam_env: bool = F
 
         # Default DLL overrides
         if not return_steam_env:
-            if all(not s.startswith("mshtml=") for s in dll_overrides):
-                dll_overrides.append("mshtml=d")
             dll_overrides.append("winemenubuilder=''")
 
         # Get Runtime libraries