File: 01_debian-support.patch

package info (click to toggle)
software-properties 0.111-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 6,944 kB
  • sloc: python: 8,238; makefile: 19; sh: 18; xml: 10
file content (275 lines) | stat: -rw-r--r-- 10,608 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
From 3943cfc73b5f0ba24bdfa7d767000ebed668f959 Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <mak@debian.org>
Date: Mon, 9 Jan 2023 00:09:31 +0100
Subject: [PATCH] Add Debian support

Implement some Debian support and make a lot of Ubuntu features optional
and only active when run on Ubuntu, instead of crashing on Debian.
---
 .../gtk/SoftwarePropertiesGtk.py              | 19 +++++++++++--------
 softwareproperties/gtk/utils.py               | 14 +++++++++++---
 2 files changed, 22 insertions(+), 11 deletions(-)

--- a/softwareproperties/gtk/SoftwarePropertiesGtk.py
+++ b/softwareproperties/gtk/SoftwarePropertiesGtk.py
@@ -57,10 +57,10 @@
 from .DialogEditDeb822 import DialogEditDeb822
 from .DialogCacheOutdated import DialogCacheOutdated
 from .DialogAddSourcesList import DialogAddSourcesList
-from .UbuntuProPage import UbuntuProPage
 
 import softwareproperties
 import softwareproperties.distro
+from softwareproperties.distro import is_current_distro_ubuntu
 from softwareproperties.SoftwareProperties import SoftwareProperties
 import softwareproperties.SoftwareProperties
 
@@ -71,7 +71,9 @@
     is_current_distro_lts,
 )
 
-from UbuntuDrivers import detect
+if is_current_distro_ubuntu():
+    from .UbuntuProPage import UbuntuProPage
+    from UbuntuDrivers import detect
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
 if GLib.pyglib_version < (3, 9, 1):
@@ -273,11 +275,15 @@
         # Setup and show the distro elements
         self.init_distro()
         self.show_distro()
-        # Setup and show the Additonal Drivers tab
-        self.init_drivers()
-        # Setup and show the Ubuntu Pro tab if the serie is a LTS
-        if is_current_distro_lts():
-            self.init_ubuntu_pro()
+        if is_current_distro_ubuntu():
+            # Setup and show the Additonal Drivers tab
+            self.init_drivers()
+            # Setup and show the Ubuntu Pro tab if the serie is a LTS
+            if is_current_distro_lts():
+                self.init_ubuntu_pro()
+        else:
+            self.label_snap_info.set_visible(False)
+            self.tab_updates.set_visible(self.have_unattended_upgrades())
 
         # Connect to switch-page before setting initial tab. Otherwise the
         # first switch goes unnoticed.
@@ -496,18 +502,23 @@
                 eol_text = _("Basic Security Maintenance")
                 eol_date = distro.eol
         self.label_esm_status.set_markup(eol_text)
+        if not is_current_distro_ubuntu():
+            self.label_updates_1.set_markup(_("Software on this system has:"))
         esm_url = "https://ubuntu.com/esm"  # Non-EOL LTS generic ESM
         today = datetime.datetime.now().date()
-        if today >= eol_date:
+        if eol_date and today >= eol_date:
                 if esm_available:
                         # EOL LTS uses release-specific ESM ubuntu.com/XX-YY
                         distro_ver = distro.version.replace(' LTS', '')
                         esm_url = "https://ubuntu.com/%s" % distro_ver.replace(".", "-")
                 eol_expiry_text = _("Ended %s - extend or upgrade now") % eol_date.strftime("%x")
-        elif today >= eol_date - datetime.timedelta(days=60):
+        elif eol_date and today >= eol_date - datetime.timedelta(days=60):
                 eol_expiry_text = _("Ends %s - extend or upgrade soon") % eol_date.strftime("%x")
         else:
+            if eol_date:
                 eol_expiry_text = _("Active until %s") % eol_date.strftime("%x")
+            else:
+                eol_expiry_text = _("End of life date not known yet.")
         self.label_eol.set_label(eol_expiry_text)
         self.label_esm_subscribe.set_markup(
                 "<a href=\"%s\">%s</a>" % (esm_url, _("Extend…"))
@@ -515,12 +526,14 @@
         self.label_esm_subscribe.set_visible(
                 esm_available and not esm_enabled
         )
-        eol_expiry_text = _("Ended %s") % eol_date.strftime("%x")
 
         # Setup the combo box for updates subscriptions
         combobox = self.combobox_updates_subscription
         self.handlers[combobox] = combobox.connect(
             "changed", self.on_combobox_updates_subscription_changed)
+        if not is_current_distro_ubuntu():
+            combobox.set_visible(False)
+            self.label_updates_3.set_visible(False)
 
         # setup the server chooser
         cell = Gtk.CellRendererText()
@@ -1341,7 +1354,6 @@
 
     def init_drivers(self):
         """Additional Drivers tab"""
-
         self.button_driver_revert = Gtk.Button(label=_("Re_vert"), use_underline=True)
         self.button_driver_revert.connect("clicked", self.on_driver_changes_revert)
         self.button_driver_apply = Gtk.Button(label=_("_Apply Changes"), use_underline=True)
@@ -1439,7 +1451,7 @@
         self.update_drivers_control_button()
 
     def on_driver_selection_changed(self, button, modalias, pkg_name=None):
-        if self.ui_building:
+        if self.ui_building or not is_current_distro_ubuntu():
             return
 
         pkg = None
--- a/softwareproperties/gtk/utils.py
+++ b/softwareproperties/gtk/utils.py
@@ -27,6 +27,7 @@
 import json
 import os
 import subprocess
+from softwareproperties.distro import is_current_distro_ubuntu
 
 import logging
 LOG=logging.getLogger(__name__)
@@ -55,19 +56,26 @@
     except Exception:
         return False
 
+def get_distro_info(distro):
+    if isinstance(distro, aptsources.distro.UbuntuDistribution):
+        return distro_info.UbuntuDistroInfo()
+    return distro_info.DebianDistroInfo()
+
 def is_current_distro_lts():
+    if not is_current_distro_ubuntu():
+        return False
     distro = aptsources.distro.get_distro()
-    di = distro_info.UbuntuDistroInfo()
+    di = get_distro_info(distro)
     return di.is_lts(distro.codename)
 
 def is_current_distro_supported():
     distro = aptsources.distro.get_distro()
-    di = distro_info.UbuntuDistroInfo()
+    di = get_distro_info(distro)
     return distro.codename in di.supported(datetime.now().date())
 
 def current_distro():
     distro = aptsources.distro.get_distro()
-    di = distro_info.UbuntuDistroInfo()
+    di = get_distro_info(distro)
     releases = di.get_all(result="object")
     for release in releases:
         if release.series == distro.codename:
@@ -82,6 +90,8 @@
     # Invoking `pro status` with subp will result in a network call to
     # contracts.canonical.com which could raise Timeouts on network limited
     # machines. So, prefer the status.json file when possible.
+    if not is_current_distro_ubuntu():
+        return {}
     status_json = ""
     if os.path.exists(UA_STATUS_JSON):
         with open(UA_STATUS_JSON) as stream:
--- a/softwareproperties/distro.py
+++ b/softwareproperties/distro.py
@@ -23,6 +23,10 @@
 import aptsources.distro
 from gettext import gettext as _
 
+
+def is_current_distro_ubuntu():
+    return isinstance(aptsources.distro.get_distro(), aptsources.distro.UbuntuDistribution)
+
 def get_popcon_description(distro):
     if isinstance(distro, aptsources.distro.UbuntuDistribution):
         return(_("<i>To improve the user experience of Ubuntu please "
--- a/softwareproperties/qt/SoftwarePropertiesQt.py
+++ b/softwareproperties/qt/SoftwarePropertiesQt.py
@@ -41,6 +41,7 @@
 
 import softwareproperties
 import softwareproperties.distro
+from softwareproperties.distro import is_current_distro_ubuntu
 from softwareproperties.SoftwareProperties import SoftwareProperties
 import softwareproperties.SoftwareProperties
 from .I18nHelper import *
@@ -52,12 +53,14 @@
 from .DialogMirror import DialogMirror
 from .CdromProgress import CdromProgress
 
-from UbuntuDrivers import detect
 import sys
 from functools import partial
 import aptsources.distro
 import logging
 
+if is_current_distro_ubuntu():
+    from UbuntuDrivers import detect
+
 class DetectDriverThread(QThread):
   #WARNING class to run detect_drivers() in separate thread
   #so GUI won't freeze.
@@ -133,6 +136,8 @@
     self.show_cdrom_sources()
     # Setup and show the Additonal Drivers tab
     self.init_drivers()
+    # Only show updates tab if unattended-upgrades is installed
+    self.userinterface.tabWidget.setTabVisible(2, self.have_unattended_upgrades())
 
     # Connect to switch-page before setting initial tab. Otherwise the
     # first switch goes unnoticed.
@@ -999,6 +1004,10 @@
 
   def init_drivers(self):
     """Additional Drivers tab"""
+    if not is_current_distro_ubuntu():
+        self.userinterface.tabWidget.setTabVisible(4, False)
+        return
+
     self.button_driver_revert = QPushButton("Revert")
     self.button_driver_apply = QPushButton("Apply Changes")
     self.button_driver_cancel = QPushButton("Cancel")
@@ -1047,6 +1056,8 @@
 
   def detect_drivers(self):
     # WARNING: This is run in a separate thread.
+    if not is_current_distro_ubuntu():
+        return
     self.detect_called = True
     self.init_apt_cache()
     try:
@@ -1064,7 +1075,7 @@
     #print(modalias)
     #print(pkg_name)
 
-    if self.ui_building:
+    if self.ui_building or not is_current_distro_ubuntu():
       return
 
     pkg = None
--- a/data/gtkbuilder/main.ui
+++ b/data/gtkbuilder/main.ui
@@ -395,7 +395,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment">
+              <object class="GtkAlignment" id="tab_updates">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xscale">0</property>
@@ -408,7 +408,7 @@
                     <property name="spacing">18</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkLabel">
+                      <object class="GtkLabel" id="label_snap_info">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Snap package updates are checked routinely and installed automatically.</property>
--- a/softwareproperties/SoftwareProperties.py
+++ b/softwareproperties/SoftwareProperties.py
@@ -283,6 +283,9 @@
     with open(self.popconfile, "w") as f:
         f.writelines(lines)
 
+  def have_unattended_upgrades(self):
+      return os.path.isfile("/usr/bin/unattended-upgrade")
+
   def get_source_code_state(self):
     """Return True if all distro componets are also available as
        source code. Otherwise return Flase. Special case: If the