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

improve code to ensure to not leave with locked databases

Browse Source
This commit is contained in:
guinux
2015-03-28 15:17:14 +01:00
parent aea37c9ea7
commit 1058576cce
6 changed files with 66 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/tray.vala
View File

@@ -40,6 +40,7 @@ namespace Pamac {
uint refresh_timeout_id;
Gtk.StatusIcon status_icon;
Gtk.Menu menu;
GLib.File lockfile;
public TrayIcon () {
application_id = "org.manjaro.pamac.tray";
@@ -56,7 +57,7 @@ namespace Pamac {
}
void stop_daemon () {
if (check_pamac_running () == false) {
if (check_pamac_running () == false && lockfile.query_exists () == false) {
try {
daemon.quit ();
} catch (IOError e) {
@@ -177,23 +178,31 @@ namespace Pamac {
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
if (run)
return run;
else {
app = new Application ("org.manjaro.pamac.updater", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
run = app.get_is_remote ();
if (run) {
return run;
}
app = new Application ("org.manjaro.pamac.updater", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
if (run) {
return run;
}
app = new Application ("org.manjaro.pamac.install", 0);
try {
app.register ();
} catch (GLib.Error e) {
stderr.printf ("%s\n", e.message);
}
run = app.get_is_remote ();
return run;
}
bool check_pacman_running () {
GLib.File lockfile = GLib.File.new_for_path ("/var/lib/pacman/db.lck");
if (locked) {
if (lockfile.query_exists () == false) {
locked = false;
@@ -237,10 +246,12 @@ namespace Pamac {
Notify.init (_("Update Manager"));
var alpm_config = new Alpm.Config ("/etc/pacman.conf");
lockfile = GLib.File.new_for_path (alpm_config.handle.lockfile);
Timeout.add (500, check_pacman_running);
refresh ();
var pamac_config = new Pamac.Config ("/etc/pamac.conf");
launch_refresh_timeout ((uint) pamac_config.refresh_period);
Timeout.add (500, check_pacman_running);
this.hold ();
}