diff options
| author | Sam Burgos | 2020-03-05 17:50:53 -0600 |
|---|---|---|
| committer | Sam Burgos | 2020-03-05 17:50:53 -0600 |
| commit | cf8da4ce9208573a0d982374289987f52eff385d (patch) | |
| tree | ae1c73d3198cc639c805c76b8757d902532f0db0 /install_remove_apt_check.patch | |
| parent | 0ead2b45b444d17d8a0f748716e9016cc6a97e2f (diff) | |
| download | aur-cf8da4ce9208573a0d982374289987f52eff385d.tar.gz | |
updated to version 1.5.4 and updated the corresponding patches
Diffstat (limited to 'install_remove_apt_check.patch')
| -rw-r--r-- | install_remove_apt_check.patch | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/install_remove_apt_check.patch b/install_remove_apt_check.patch index 77fe384e7b45..43d9375cc15f 100644 --- a/install_remove_apt_check.patch +++ b/install_remove_apt_check.patch @@ -1,50 +1,48 @@ --- a/usr/lib/linuxmint/mintlocale/install_remove.py +++ b/usr/lib/linuxmint/mintlocale/install_remove.py -@@ -2,18 +2,23 @@ +@@ -2,15 +2,21 @@ import os import gettext -import apt_pkg import subprocess - import tempfile import locale import codecs --import mintcommon +-import mintcommon.aptdaemon import gi gi.require_version('Gtk', '3.0') - gi.require_version('XApp', '1.0') - from gi.repository import GdkX11 - from gi.repository import Gtk, GdkPixbuf, XApp + from gi.repository import Gtk, Gdk, GdkPixbuf + -+# Used to detect Debian derivatives (we don't want to show APT features in other distros) -+IS_DEBIAN = os.path.exists("/etc/debian_version") -+ -+if IS_DEBIAN: -+ import apt_pkg -+ import mintcommon +++ +++# Used to detect Debian derivatives (we don't want to show APT features in other distros) +++IS_DEBIAN = os.path.exists("/etc/debian_version") +++ +++if IS_DEBIAN: +++ import apt_pkg +++ import mintcommon.aptdaemon # i18n APP = 'mintlocale' -@@ -56,8 +61,9 @@ +@@ -53,8 +59,9 @@ else: self.language_packs.append(LanguagePack(category, language, dependency, package)) - apt_pkg.init() - self.cache = apt_pkg.Cache(None) + if IS_DEBIAN: -+ apt_pkg.init() -+ self.cache = apt_pkg.Cache(None) ++ apt_pkg.init() ++ self.cache = apt_pkg.Cache(None) self.cache_updated = False -@@ -130,7 +136,8 @@ +@@ -134,7 +141,8 @@ return (language_code, country_code, language_label) def build_lang_list(self): - self.cache = apt_pkg.Cache(None) -+ if IS_DEBIAN: -+ self.cache = apt_pkg.Cache(None) ++ if IS_DEBIAN: ++ self.cache = apt_pkg.Cache(None) self.builder.get_object('button_install').set_sensitive(False) self.builder.get_object('button_remove').set_sensitive(False) |