646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
43 lines
2.0 KiB
Diff
43 lines
2.0 KiB
Diff
diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py
|
|
index 802b08b5..e3de0536 100644
|
|
--- a/bottles/frontend/windows/window.py
|
|
+++ b/bottles/frontend/windows/window.py
|
|
@@ -102,29 +102,30 @@ class BottlesWindow(Adw.ApplicationWindow):
|
|
|
|
def response(dialog, response, *args):
|
|
if response == "close":
|
|
- quit(1)
|
|
+ return
|
|
|
|
body = _(
|
|
- "Bottles is only supported within a sandboxed environment. Official sources of Bottles are available at"
|
|
+ "Bottles is only supported within a sandboxed environment. Please report any issues at:"
|
|
)
|
|
- download_url = "usebottles.com/download"
|
|
+ bugtracker_url = "github.com/NixOS/nixpkgs/issues"
|
|
+
|
|
|
|
error_dialog = Adw.AlertDialog.new(
|
|
_("Unsupported Environment"),
|
|
- f"{body} <a href='https://{download_url}' title='https://{download_url}'>{download_url}.</a>",
|
|
+ f"{body} <a href='https://{bugtracker_url}' title='https://{bugtracker_url}'>{bugtracker_url}.</a> \nThis warning can be disabled by overriding the package: `(pkgs.bottles.override {{ removeWarningPopup = true; }})`",
|
|
)
|
|
|
|
error_dialog.add_response("close", _("Close"))
|
|
error_dialog.set_body_use_markup(True)
|
|
error_dialog.connect("response", response)
|
|
error_dialog.present(self)
|
|
- logging.error(
|
|
+ logging.warn(
|
|
_(
|
|
"Bottles is only supported within a sandboxed format. Official sources of Bottles are available at:"
|
|
)
|
|
)
|
|
- logging.error("https://usebottles.com/download/")
|
|
- return
|
|
+ logging.warn("https://usebottles.com/download/")
|
|
+ logging.warn("Please report any issues at: https://github.com/NixOS/nixpkgs/issues")
|
|
|
|
# Loading view
|
|
self.page_loading = LoadingView()
|