Hello community, here is the log from the commit of package PackageKit checked in at Tue Jun 10 12:39:16 CEST 2008. -------- --- PackageKit/PackageKit.changes 2008-05-24 21:41:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/PackageKit/PackageKit.changes 2008-06-09 19:27:11.169184000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 9 19:33:22 CEST 2008 - sreeves@suse.de + +- Fix for BNC#398367 - dont include recommends + Fix for BNC#398380 - init keyring + +------------------------------------------------------------------- New: ---- PackageKit-bnc398367-bnc398380.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.m16821/_old 2008-06-10 12:39:12.000000000 +0200 +++ /var/tmp/diff_new_pack.m16821/_new 2008-06-10 12:39:12.000000000 +0200 @@ -12,7 +12,7 @@ Name: PackageKit Version: 0.2.1 -Release: 10 +Release: 17 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: NetworkManager-devel PolicyKit-devel dbus-1-glib-devel fdupes gcc-c++ glib2-devel gtk-doc intltool libzypp-devel perl-XML-Parser python-devel sqlite-devel @@ -23,6 +23,7 @@ Patch: PackageKit_release.patch Patch1: PackageKit-ac.patch Patch2: PackageKit-openSUSE-branch.patch +Patch3: PackageKit-bnc398367-bnc398380.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Requires: dbus-1 PolicyKit @@ -95,6 +96,7 @@ %patch -p1 %patch1 %patch2 -p1 +%patch3 -p1 %build # uncomment out the following line if autotools should be run again (i.e., @@ -173,6 +175,9 @@ %{_libdir}/libpackagekit.so %changelog +* Mon Jun 09 2008 sreeves@suse.de +- Fix for BNC#398367 - dont include recommends + Fix for BNC#398380 - init keyring * Sat May 24 2008 sreeves@suse.de - Include updates from the openSUSE branch Update to match changed libzypp API ++++++ PackageKit-bnc398367-bnc398380.patch ++++++ diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp index 4da636b..307d3ea 100644 --- a/backends/zypp/pk-backend-zypp.cpp +++ b/backends/zypp/pk-backend-zypp.cpp @@ -91,6 +91,7 @@ static void backend_initialize (PkBackend *backend) { zypp_logging (); + get_zypp (); pk_debug ("zypp_backend_initialize"); EventDirector *eventDirector = new EventDirector (backend); _eventDirectors [backend] = eventDirector; diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp index 2a84a3b..4b56bf9 100644 --- a/backends/zypp/zypp-utils.cpp +++ b/backends/zypp/zypp-utils.cpp @@ -631,6 +631,10 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) if (force) zypp->resolver ()->setForceResolve (force); + if (type == UPDATE) { + //zypp->resolver ()->setOnlyRequires (TRUE); + zypp->resolver ()->setIgnoreAlreadyRecommended (TRUE); + } // Gather up any dependencies pk_backend_set_status (backend, PK_STATUS_ENUM_DEP_RESOLVE); @@ -751,7 +755,10 @@ zypp_perform_execution (PkBackend *backend, PerformType type, gboolean force) return FALSE; } - zypp->resolver ()->setForceResolve (FALSE); + zypp->resolver ()->setForceResolve (FALSE); + if (type == UPDATE) { + zypp->resolver ()->setIgnoreAlreadyRecommended (FALSE); + } } catch (const zypp::repo::RepoNotFoundException &ex) { pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_FOUND, ex.asUserString().c_str() ); @@ -802,6 +809,7 @@ zypp_build_package_id_capabilities (zypp::Capabilities caps) gboolean zypp_refresh_cache (PkBackend *backend, gboolean force) { + get_zypp (); //This call is needed as it calls initializeTarget which appears to properly setup the keyring if (!pk_backend_is_online (backend)) { pk_backend_error_code (backend, PK_ERROR_ENUM_NO_NETWORK, "Cannot refresh cache whilst offline"); return FALSE; diff --git a/backends/zypp/zypp-utils.h b/backends/zypp/zypp-utils.h ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de