98 lines
4.4 KiB
Diff
98 lines
4.4 KiB
Diff
diff -ru source.orig/UpdateManager/Dialogs.py source/UpdateManager/Dialogs.py
|
|
--- source.orig/UpdateManager/Dialogs.py 2018-02-12 20:44:33.321329066 -0500
|
|
+++ source/UpdateManager/Dialogs.py 2018-02-12 20:45:28.141249480 -0500
|
|
@@ -161,7 +162,21 @@
|
|
self.add_settings_button()
|
|
self.focus_button = self.add_button(Gtk.STOCK_OK,
|
|
self.window_main.close)
|
|
+class ShouldUpdateDialog(InternalDialog):
|
|
+ def __init__(self, window_main):
|
|
|
|
+ InternalDialog.__init__(self, window_main)
|
|
+ self.set_header(_("Include latest updates from the Internet?"))
|
|
+ self.set_desc(_('''To prevent unwanted connections to the Internet
|
|
+Trisquel will not automatically check for updates
|
|
+unless you say so in the Settings panel.'''))
|
|
+ self.add_settings_button()
|
|
+ self.add_button(_("Check for Updates"),self.check)
|
|
+ self.add_button(_("Ask Me Later"), self.window_main.close)
|
|
+
|
|
+ def check(self):
|
|
+ self.window_main.options.no_update = False
|
|
+ self.window_main.check_update()
|
|
|
|
class DistUpgradeDialog(InternalDialog):
|
|
def __init__(self, window_main, meta_release):
|
|
diff -ru source.orig/UpdateManager/UpdateManager.py source/UpdateManager/UpdateManager.py
|
|
--- source.orig/UpdateManager/UpdateManager.py 2018-02-12 20:44:33.317329071 -0500
|
|
+++ source/UpdateManager/UpdateManager.py 2018-02-12 20:45:28.133249491 -0500
|
|
@@ -52,6 +52,7 @@
|
|
ErrorDialog,
|
|
HWEUpgradeDialog,
|
|
NeedRestartDialog,
|
|
+ ShouldUpdateDialog,
|
|
NoUpdatesDialog,
|
|
PartialUpgradeDialog,
|
|
StoppedUpdatesDialog,
|
|
@@ -205,6 +206,17 @@
|
|
self.start_available()
|
|
|
|
def start_update(self):
|
|
+ if not self.options.no_check_screen and apt_pkg.config.find_i("APT::Periodic::Update-Package-Lists") == 0:
|
|
+ self._start_pane(ShouldUpdateDialog(self))
|
|
+ return
|
|
+ if self.options.no_update:
|
|
+ self.start_available()
|
|
+ return
|
|
+
|
|
+ update_backend = get_backend(self, InstallBackend.ACTION_UPDATE)
|
|
+ self._start_pane(update_backend)
|
|
+
|
|
+ def check_update(self):
|
|
if self.options.no_update:
|
|
self.start_available()
|
|
return
|
|
diff -ru source.orig/update-manager source/update-manager
|
|
--- source.orig/update-manager 2023-04-30 19:59:16.611564826 -0400
|
|
+++ source/update-manager 2023-04-30 20:10:25.515512178 -0400
|
|
@@ -92,6 +92,9 @@
|
|
parser.add_option ("--no-update", action="store_true",
|
|
dest="no_update", default=False,
|
|
help=_("Do not check for updates when starting"))
|
|
+ parser.add_option ("--no-check-screen", action="store_true",
|
|
+ dest="no_check_screen", default=False,
|
|
+ help=_("Don't show screen preventing unwanted connections to the Internet"))
|
|
parser.add_option ("", "--debug", action="store_true", default=False,
|
|
help=_("Show debug messages"))
|
|
|
|
diff -ru source.orig/UpdateManager/UpdateManager.py source/UpdateManager/UpdateManager.py
|
|
--- source.orig/UpdateManager/UpdateManager.py 2023-05-01 10:29:34.494164650 -0400
|
|
+++ source/UpdateManager/UpdateManager.py 2023-05-01 12:04:53.000000000 -0400
|
|
@@ -121,10 +121,11 @@
|
|
"focus-in-event", self.on_initial_focus_in)
|
|
|
|
# Look for a new release in a thread
|
|
- self.meta_release = MetaRelease(
|
|
- self.options and self.options.devel_release,
|
|
- self.options and self.options.use_proposed,
|
|
- self.options and self.options.debug)
|
|
+ if self.options.check_dist_upgrades and apt_pkg.config.find_i("APT::Periodic::Update-Package-Lists") != 0:
|
|
+ self.meta_release = MetaRelease(
|
|
+ self.options and self.options.devel_release,
|
|
+ self.options and self.options.use_proposed,
|
|
+ self.options and self.options.debug)
|
|
|
|
def begin_user_resizable(self, stored_width=0, stored_height=0):
|
|
self.set_resizable(True)
|
|
@@ -234,6 +235,11 @@
|
|
self.start_available()
|
|
return
|
|
|
|
+ self.meta_release = MetaRelease(
|
|
+ self.options and self.options.devel_release,
|
|
+ self.options and self.options.use_proposed,
|
|
+ self.options and self.options.debug)
|
|
+
|
|
update_backend = get_backend(self, InstallBackend.ACTION_UPDATE)
|
|
self._start_pane(update_backend)
|
|
|