From 97dee2e0b1cb9d253ad27fab486e03073c1f85ea Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Mon, 24 Sep 2018 13:50:49 +0200 Subject: [PATCH 2/5] Stop trying apt_pkg.pkgsystem_(un)lock(), as a normal user it always fails --- UpdateManager/UpdateManager.py | 10 ---------- UpdateManager/backend/InstallBackendAptdaemon.py | 8 -------- UpdateManager/backend/InstallBackendSynaptic.py | 4 ---- 3 files changed, 22 deletions(-) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index c3d9ab02..8a2d7e0f 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -192,10 +192,6 @@ class UpdateManager(Gtk.Window): sys.exit(0) def show_settings(self): - try: - apt_pkg.pkgsystem_unlock() - except SystemError: - pass cmd = ["/usr/bin/software-properties-gtk", "--open-tab", "2"] @@ -357,12 +353,6 @@ class UpdateManager(Gtk.Window): # fixme: we should probably abstract away all the stuff from libapt def refresh_cache(self): - # get the lock - try: - apt_pkg.pkgsystem_lock() - except SystemError: - pass - try: if self.cache is None: self.cache = MyCache(None) diff --git a/UpdateManager/backend/InstallBackendAptdaemon.py b/UpdateManager/backend/InstallBackendAptdaemon.py index 022ca5ac..48aef358 100644 --- a/UpdateManager/backend/InstallBackendAptdaemon.py +++ b/UpdateManager/backend/InstallBackendAptdaemon.py @@ -58,10 +58,6 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog): @inline_callbacks def update(self): """Refresh the package list""" - try: - apt.apt_pkg.pkgsystem_unlock() - except SystemError: - pass try: trans = yield self.client.update_cache(defer=True) yield self._show_transaction(trans, self.ACTION_UPDATE, @@ -79,10 +75,6 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog): @inline_callbacks def commit(self, pkgs_install, pkgs_upgrade, pkgs_remove): """Commit a list of package adds and removes""" - try: - apt.apt_pkg.pkgsystem_unlock() - except SystemError: - pass try: reinstall = purge = downgrade = [] trans = yield self.client.commit_packages( diff --git a/UpdateManager/backend/InstallBackendSynaptic.py b/UpdateManager/backend/InstallBackendSynaptic.py index a3236ed0..48611cb2 100644 --- a/UpdateManager/backend/InstallBackendSynaptic.py +++ b/UpdateManager/backend/InstallBackendSynaptic.py @@ -52,10 +52,6 @@ class InstallBackendSynaptic(InstallBackend): def _run_synaptic(self, action, opt, tempf): """Execute synaptic.""" - try: - apt_pkg.pkgsystem_unlock() - except SystemError: - pass win = self.window_main.get_window() try: xid = win.get_xid() -- 2.17.1