Skip to content

Commit 7c52e88

Browse files
committed
Simplify mirror identification
"main upstream import" is enough to ID the Mint repository.
1 parent 9fd336a commit 7c52e88

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

debian/control

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ Depends:
1919
python3-apt,
2020
python3-pycurl,
2121
python3-setproctitle,
22-
python3-xapp (>= 2.4.2),
22+
python3-xapp (>= 1.6),
2323
synaptic,
2424
systemd,
2525
mint-common (>= 2.2.4),
2626
mint-mirrors,
2727
mint-upgrade-info,
28-
python3-xapp (>= 1.0.1),
2928
gir1.2-notify-0.7,
3029
gir1.2-xapp-1.0
3130
Description: The Linux Mint Update Manager

usr/lib/linuxmint/mintUpdate/mintUpdate.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
from Classes import Update, PRIORITY_UPDATES, UpdateTracker
3131
from xapp.GSettingsWidgets import *
32-
import xapp.os
33-
3432

3533
settings = Gio.Settings(schema_id="com.linuxmint.updates")
3634
cinnamon_support = False
@@ -1191,12 +1189,10 @@ def mirror_check(self):
11911189
try:
11921190
if os.path.exists("/usr/bin/mintsources") and os.path.exists("/etc/apt/sources.list.d/official-package-repositories.list"):
11931191
mirror_url = None
1194-
1195-
codename = xapp.os.get_os_release_info()["VERSION_CODENAME"]
11961192
with open("/etc/apt/sources.list.d/official-package-repositories.list", 'r') as sources_file:
11971193
for line in sources_file:
11981194
line = line.strip()
1199-
if line.startswith("deb ") and "%s main upstream import" % codename in line:
1195+
if line.startswith("deb ") and "main upstream import" in line:
12001196
mirror_url = line.split()[1]
12011197
if mirror_url.endswith("/"):
12021198
mirror_url = mirror_url[:-1]

0 commit comments

Comments
 (0)