diff -Nru mintsources-2.0.1~gm10/debian/changelog mintsources-2.0.2~gm10/debian/changelog --- mintsources-2.0.1~gm10/debian/changelog 2019-07-03 14:22:59.000000000 +0000 +++ mintsources-2.0.2~gm10/debian/changelog 2019-07-05 09:30:13.000000000 +0000 @@ -1,3 +1,10 @@ +mintsources (1:2.0.2~gm10) bionic; urgency=medium + + * Fix regression where source and debug repos could not be disabled anymore + * Work around encoding issue with localization in non-unicode environments + + -- gm10 Fri, 05 Jul 2019 11:30:13 +0200 + mintsources (1:2.0.1~gm10) bionic; urgency=medium * Add -s/--enable-source and -d/--disable-source options to control source diff -Nru mintsources-2.0.1~gm10/usr/lib/linuxmint/mintSources/foreign_packages.py mintsources-2.0.2~gm10/usr/lib/linuxmint/mintSources/foreign_packages.py --- mintsources-2.0.1~gm10/usr/lib/linuxmint/mintSources/foreign_packages.py 2019-07-03 14:22:59.000000000 +0000 +++ mintsources-2.0.2~gm10/usr/lib/linuxmint/mintSources/foreign_packages.py 2019-07-05 09:30:13.000000000 +0000 @@ -10,6 +10,7 @@ import apt_pkg import mintcommon.aptdaemon +from mintcommon.localization import localized_ui # i18n gettext.bindtextdomain("mintsources", "/usr/share/linuxmint/locale") @@ -23,8 +24,8 @@ def __init__(self): # mode of operation self.mode = sys.argv[1] - self.builder = Gtk.Builder() - self.builder.add_from_file("/usr/share/linuxmint/mintsources/mintsources.ui") + self.builder = Gtk.Builder.new_from_string( + localized_ui("/usr/share/linuxmint/mintsources/mintsources.ui", _), -1) self.window = self.builder.get_object("foreign_window") self.window.connect("destroy", Gtk.main_quit) self.builder.get_object("button_foreign_cancel").connect("clicked", Gtk.main_quit) diff -Nru mintsources-2.0.1~gm10/usr/lib/linuxmint/mintSources/mintSources.py mintsources-2.0.2~gm10/usr/lib/linuxmint/mintSources/mintSources.py --- mintsources-2.0.1~gm10/usr/lib/linuxmint/mintSources/mintSources.py 2019-07-03 14:22:59.000000000 +0000 +++ mintsources-2.0.2~gm10/usr/lib/linuxmint/mintSources/mintSources.py 2019-07-05 09:30:13.000000000 +0000 @@ -20,12 +20,13 @@ gi.require_version('Gtk', '3.0') from gi.repository import Gtk, Gdk, GdkPixbuf, GObject, Pango +import apt_pkg import mintcommon.aptdaemon +import pycurl import requests from aptsources.sourceslist import SourcesList +from mintcommon.localization import localized_ui -import apt_pkg -import pycurl from CountryInformation import CountryInformation BUTTON_LABEL_MAX_LENGTH = 30 @@ -1178,8 +1179,8 @@ self.infobar_visible = False - self.builder = Gtk.Builder() - self.builder.add_from_file(f"{MINTSOURCES_DATA_PATH}mintsources.ui") + self.builder = Gtk.Builder.new_from_string( + localized_ui(f"{MINTSOURCES_DATA_PATH}mintsources.ui", _), -1) self.main_window = self.builder.get_object("main_window") self.label_mirror_name = self.builder.get_object("label_mirror_name") @@ -2031,6 +2032,8 @@ # Update official repositories for repo_type, repository in official_repository_lists.items(): + if os.path.isfile(repository): + os.unlink(repository) if repo_type == "source" and not self.builder.get_object("source_code_switch").get_active(): continue elif repo_type == "dbgsym" and not self.builder.get_object("debug_symbol_switch").get_active(): diff -Nru mintsources-2.0.1~gm10/usr/lib/linuxmint/mintSources/ppa_browser.py mintsources-2.0.2~gm10/usr/lib/linuxmint/mintSources/ppa_browser.py --- mintsources-2.0.1~gm10/usr/lib/linuxmint/mintSources/ppa_browser.py 2019-07-03 14:22:59.000000000 +0000 +++ mintsources-2.0.2~gm10/usr/lib/linuxmint/mintSources/ppa_browser.py 2019-07-05 09:30:13.000000000 +0000 @@ -9,6 +9,7 @@ import apt import mintcommon.aptdaemon +from mintcommon.localization import localized_ui # i18n APP = 'mintsources' @@ -25,10 +26,8 @@ self.packages_to_install = [] self.packages_installed_from_ppa = [] - - self.builder = Gtk.Builder() - self.builder.add_from_file("/usr/share/linuxmint/mintsources/mintsources.ui") - + self.builder = Gtk.Builder.new_from_string( + localized_ui("/usr/share/linuxmint/mintsources/mintsources.ui", _), -1) self.window = self.builder.get_object("ppa_window") self.window.connect("destroy", Gtk.main_quit) self.builder.get_object("button_cancel").connect("clicked", Gtk.main_quit)