File gnome-packagekit-BNC543595.patch of Package gnome-packagekit
diff --git a/src/gpk-dbus-task.c b/src/gpk-dbus-task.c
index 7f86fa5..c0c2b93 100644
--- a/src/gpk-dbus-task.c
+++ b/src/gpk-dbus-task.c
@@ -484,7 +484,8 @@ gpk_dbus_task_install_package_ids (GpkDbusTask *task)
if (!ret) {
/* TRANSLATORS: error: failed to install, detailed error follows */
gpk_dbus_task_error_msg (task, _("Failed to install package"), error_local);
- error = g_error_new (GPK_DBUS_ERROR, GPK_DBUS_ERROR_INTERNAL_ERROR, "%s", error_local->message);
+ error = g_error_new (GPK_DBUS_ERROR, GPK_DBUS_ERROR_INTERNAL_ERROR, "%s",
+ error_local ? error_local->message : NULL);
dbus_g_method_return_error (task->priv->context, error);
goto out;
}
@@ -2003,7 +2004,7 @@ gpk_dbus_task_install_files_dep_check (GpkDbusTask *task)
/* are we dumb and can't check for depends? */
if (!pk_bitfield_contain (task->priv->roles, PK_ROLE_ENUM_SIMULATE_INSTALL_FILES)) {
egg_warning ("skipping depends check");
- gpk_dbus_task_install_package_ids (task);
+ gpk_dbus_task_install_files (task);
goto out;
}
@@ -2011,7 +2012,7 @@ gpk_dbus_task_install_files_dep_check (GpkDbusTask *task)
ret = gconf_client_get_bool (task->priv->gconf_client, GPK_CONF_SHOW_DEPENDS, NULL);
if (!ret) {
egg_warning ("we've said we don't want the dep dialog");
- gpk_dbus_task_install_package_ids (task);
+ gpk_dbus_task_install_files (task);
goto out;
}