Hello community, here is the log from the commit of package gnome-packagekit for openSUSE:Factory checked in at Mon Oct 12 16:31:47 CEST 2009. -------- --- GNOME/gnome-packagekit/gnome-packagekit.changes 2009-09-30 09:01:51.000000000 +0200 +++ gnome-packagekit/gnome-packagekit.changes 2009-10-08 21:03:28.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 8 18:08:19 UTC 2009 - sreeves@novell.com + +- Fix bnc#543595 - install local files. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gnome-packagekit-BNC543595.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.PDJtO8/_old 2009-10-12 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.PDJtO8/_new 2009-10-12 16:31:28.000000000 +0200 @@ -20,7 +20,7 @@ Name: gnome-packagekit Url: http://packagekit.org/ Version: 2.27.92 -Release: 3 +Release: 4 License: GPL v2 or later Source: %{name}-%{version}.tar.bz2 Patch1: gnome-packagekit_release.patch @@ -30,6 +30,8 @@ Patch6: gnome-packagekit-BNC538353.patch #PATCH-FEATURE-OPENSUSE gnome-packagekit-BNC542819.patch sreeves@novell.com -- SUSE updates are patch based, don't try and get dependencies. Patch7: gnome-packagekit-BNC542819.patch +#PATCH-FIX-UPSTREAM gnome-packagekit-BNC543595.patch sreeves@novell.com -- install local files +Patch8: gnome-packagekit-BNC543595.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: DeviceKit-power-devel BuildRequires: PackageKit-devel @@ -79,6 +81,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build #autoreconf -f -i ++++++ gnome-packagekit-BNC543595.patch ++++++ 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; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org