File PackageKit-bnc398367-bnc398380.patch of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File PackageKit-bnc398367-bnc398380.patch of Package PackageKit (Revision 9ebdad2fbc74835e5b2d69a85411adeb)

Currently displaying revision 9ebdad2fbc74835e5b2d69a85411adeb , Show latest

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

Places

File PackageKit-bnc398367-bnc398380.patch of Package PackageKit (Revision 9ebdad2fbc74835e5b2d69a85411adeb)

Places