Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
Please login to access the resource
SUSE:SLE-12:GA
gnome-packagekit
bnc#881245-update-test-affects-package-manager-...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File bnc#881245-update-test-affects-package-manager-should-restart-gpk-update-viewer.patch of Package gnome-packagekit
Index: gnome-packagekit-3.10.1/src/gpk-update-viewer.c =================================================================== --- gnome-packagekit-3.10.1.orig/src/gpk-update-viewer.c +++ gnome-packagekit-3.10.1/src/gpk-update-viewer.c @@ -227,7 +227,17 @@ gpk_update_viewer_check_restart (void) message = _("Some of the updates that were installed require you to log out and back in before the changes will be applied."); /* TRANSLATORS: the button text for the log out */ button = _("Log Out"); - + } else if (restart_update == PK_RESTART_ENUM_APPLICATION) { + /* TRANSLATORS: the message text for the application restart */ + message = _("Some of the updates that were installed require you to restart this application before the changes will be applied."); + /* TRANSLATORS: the button text for the application restart */ + button = _("Restart Application"); + + ret = pk_control_suggest_daemon_quit (control, cancellable, &error); + if (!ret) { + gpk_update_viewer_error_dialog (_("Could not terminate PackageKit"), NULL, error->message); + g_error_free (error); + } } else if (restart_update == PK_RESTART_ENUM_SECURITY_SESSION) { /* TRANSLATORS: the message text for the log out */ message = _("Some of the updates that were installed require you to log out and back in to remain secure."); @@ -289,7 +299,22 @@ gpk_update_viewer_check_restart (void) /* use gnome-session to log out */ gpk_session_logout (session); g_object_unref (session); - } + } else if (restart_update == PK_RESTART_ENUM_APPLICATION) { + char cmd[256] = {0}; + /* need to wait for PackageKit to finish too */ + sprintf(cmd, "/bin/bash -c 'while ps -p %d > /dev/null; do sleep 1; done; while pgrep packagekitd > /dev/null; do sleep 1; done;/usr/bin/gpk-update-viewer'", getpid()); + + /* restart asynchronously after gpk-update-viewer was quit */ + ret = g_spawn_command_line_async (cmd, &error); + + if (!ret) { + gpk_update_viewer_error_dialog (_("Could not restart application"), NULL, error->message); + g_error_free (error); + } + + /* needed to force gpk-update-viewer to quit */ + ret = FALSE; + } out: return ret; } @@ -477,6 +502,7 @@ gpk_update_viewer_update_packages_cb (Pk /* check restart */ if (restart_update == PK_RESTART_ENUM_SYSTEM || restart_update == PK_RESTART_ENUM_SESSION || + restart_update == PK_RESTART_ENUM_APPLICATION || restart_update == PK_RESTART_ENUM_SECURITY_SESSION || restart_update == PK_RESTART_ENUM_SECURITY_SYSTEM) { gpk_update_viewer_check_restart (); @@ -2092,6 +2118,10 @@ gpk_update_viewer_populate_details (PkUp /* TRANSLATORS: reboot required */ gtk_text_buffer_insert_with_tags_by_name (text_buffer, &iter, _("The computer will have to be restarted after the update for the changes to take effect."), -1, "para", NULL); gtk_text_buffer_insert (text_buffer, &iter, "\n", -1); + } else if (restart == PK_RESTART_ENUM_APPLICATION) { + /* TRANSLATORS: application restart required */ + gtk_text_buffer_insert_with_tags_by_name (text_buffer, &iter, _("This application will have to be restarted after the update for the changes to take effect."), -1, "para", NULL); + gtk_text_buffer_insert (text_buffer, &iter, "\n", -1); } else if (restart == PK_RESTART_ENUM_SESSION) { /* TRANSLATORS: log out required */ gtk_text_buffer_insert_with_tags_by_name (text_buffer, &iter, _("You will need to log out and back in after the update for the changes to take effect."), -1, "para", NULL);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
