matthiakl/pamac-classic
1
0
Fork 0
forked from cromer/pamac-classic
Code Issues Pull Requests Projects Releases Wiki Activity

fix path assertion error

Browse Source
This commit is contained in:
Chris Cromer 2019-07-19 08:32:30 -04:00
parent 3b66f68b2c
commit cd1f361c51
Signed by untrusted user: cromer
GPG Key ID: 39CC813FF3C8708A
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pamac-tray/tray.vala
View File

@ -306,12 +306,10 @@ namespace Pamac {
lockfile = GLib.File.new_for_path (daemon.get_lockfile ()); lockfile = GLib.File.new_for_path (daemon.get_lockfile ());
} catch (IOError e) { } catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message); stderr.printf ("IOError: %s\n", e.message);
//try standard lock file try_standard_lock ();
lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
} catch (DBusError e) { } catch (DBusError e) {
stderr.printf ("DBusError: %s\n", e.message); stderr.printf ("DBusError: %s\n", e.message);
//try standard lock file try_standard_lock ();
lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
} }
Timeout.add (200, check_extern_lock); Timeout.add (200, check_extern_lock);
// wait 30 seconds before check updates // wait 30 seconds before check updates
@ -325,6 +323,16 @@ namespace Pamac {
this.hold (); this.hold ();
} }
private try_standard_lock () {
try {
lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
} catch (IOError e) {
stderr.printf ("IOError: %s\n", e.message);
} catch (DBusError e) {
stderr.printf ("DBusError: %s\n", e.message);
}
}
public override void activate () { public override void activate () {
// nothing to do // nothing to do
} }