diff --git a/io.github.flattool.Warehouse.json b/io.github.flattool.Warehouse.json index e0c6823..047651d 100644 --- a/io.github.flattool.Warehouse.json +++ b/io.github.flattool.Warehouse.json @@ -44,7 +44,7 @@ "name" : "warehouse", "builddir" : true, "buildsystem" : "meson", - "config-opts": [ "-Dprofile=default" ], + "config-opts": [ "-Dprofile=development" ], "sources" : [ { "type" : "dir", diff --git a/src/common.py b/src/common.py index c257ff6..1e39d2a 100644 --- a/src/common.py +++ b/src/common.py @@ -237,15 +237,19 @@ class myUtils: f"--{install_type}", "-y", ] + if "--user" in command: + command.remove("pkexec") try: response = subprocess.run( command, capture_output=True, text=True, env=self.new_env ).stderr except subprocess.CalledProcessError as e: - if "note that" in response.lower(): - return 0 + # if "note that" in response.lower(): + # return 0 print(f"Error setting mask for {app_id}:\n", e) return 1 + print(command) + print(response) return 0 def uninstall_flatpak(self, ref_arr, type_arr, should_trash, progress_bar=None, status_label=None): diff --git a/src/downgrade_window.py b/src/downgrade_window.py index 7a18434..5c55ad2 100644 --- a/src/downgrade_window.py +++ b/src/downgrade_window.py @@ -116,8 +116,7 @@ class DowngradeWindow(Adw.Window): if self.response != 0: self.toast_overlay.add_toast( - Adw.TThis - is toast.new(_("Could not downgrade {}").format(self.app_name)) + Adw.Toast.new(_("Could not downgrade {}").format(self.app_name)) ) self.apply_button.set_sensitive(True) self.cancel_button.set_sensitive(True) @@ -132,6 +131,7 @@ class DowngradeWindow(Adw.Window): ) self.parent_window.refresh_list_of_flatpaks(self, False) + print(self.response) self.close() def downgrade_thread(self):