File PackageKit-bnc398391.patch of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File PackageKit-bnc398391.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..60f0333 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -614,21 +614,18 @@ backend_get_updates_thread (PkBackend *backend)
 
 	// get all Packages and Patches for Update
 	std::set<zypp::PoolItem> *candidates = zypp_get_patches ();
-	std::set<zypp::PoolItem> *candidates2 = new std::set<zypp::PoolItem> ();
+	//std::set<zypp::PoolItem> *candidates2 = new std::set<zypp::PoolItem> ();
 
 	if (!_updating_self) {
-		//disabling patchrepo
-		zypp::RepoInfo patchRepo;
+		// exclude the patch-repository
+		std::string patchRepo;
 		if (!candidates->empty ()) {
-			patchRepo = candidates->begin ()->resolvable ()->repoInfo ();
-			patchRepo.setEnabled (FALSE);
+			patchRepo = candidates->begin ()->resolvable ()->repoInfo ().alias ();
 		}
 		
-		candidates2 = zypp_get_updates ();
-		//enable patchRepo
-		patchRepo.setEnabled (TRUE);
+		//candidates2 = zypp_get_updates (patchRepo);
 
-		candidates->insert (candidates2->begin (), candidates2->end ());
+		//candidates->insert (candidates2->begin (), candidates2->end ());
 	}
 
 	pk_backend_set_percentage (backend, 80);
@@ -661,7 +658,7 @@ backend_get_updates_thread (PkBackend *backend)
 	}
 
 	delete (candidates);
-	delete (candidates2);
+	//delete (candidates2);
 
  	pk_backend_set_percentage (backend, 100);
 	pk_backend_finished (backend);
@@ -904,7 +901,7 @@ backend_update_system_thread (PkBackend *backend)
 
 	//get all Patches for Update
 	std::set<zypp::PoolItem> *candidates = zypp_get_patches ();
-	std::set<zypp::PoolItem> *candidates2 = new std::set<zypp::PoolItem> ();
+	//std::set<zypp::PoolItem> *candidates2 = new std::set<zypp::PoolItem> ();
 	
 	if (_updating_self) {
 		pk_backend_require_restart (backend, PK_RESTART_ENUM_SESSION, _("Package Management System updated - restart needed"));
@@ -912,20 +909,17 @@ backend_update_system_thread (PkBackend *backend)
 	}
 	else {
 		//disabling patchrepo
-		zypp::RepoInfo patchRepo;
+		std::string patchRepo;
 		if (!candidates->empty ()) {
-			patchRepo = candidates->begin ()->resolvable ()->repoInfo ();
-			patchRepo.setEnabled (FALSE);
+			patchRepo = candidates->begin ()->resolvable ()->repoInfo ().alias ();
 		}
 	
 		//get all Updates
-		candidates2 = zypp_get_updates ();
-		//enable patchRepo
-		patchRepo.setEnabled (TRUE);// get all Packages for Update
+		//candidates2 = zypp_get_updates (patchRepo);
 
 		//concatenate these sets
 
-		candidates->insert (candidates2->begin (), candidates2->end ());
+		//candidates->insert (candidates2->begin (), candidates2->end ());
 	}
 
 	pk_backend_set_percentage (backend, 80);
@@ -942,7 +936,7 @@ backend_update_system_thread (PkBackend *backend)
 		return FALSE;
 	}
 
-	delete (candidates2);
+	//delete (candidates2);
 	delete (candidates);
 	pk_backend_set_percentage (backend, 100);
 	pk_backend_finished (backend);
@@ -1390,6 +1384,10 @@ backend_repo_enable (PkBackend *backend, const gchar *rid, gboolean enabled)
 		repo = manager.getRepositoryInfo (rid);
 		repo.setEnabled (enabled);
 		manager.modifyRepository (rid, repo);
+		if (!enabled) {
+			zypp::Repository repository = zypp::sat::Pool::instance ().reposFind (repo.alias ());
+			repository.eraseFromPool ();
+		}
 	} catch (const zypp::repo::RepoNotFoundException &ex) {
 		pk_backend_error_code (backend, PK_ERROR_ENUM_REPO_NOT_FOUND, "Couldn't find the specified repository");
 		pk_backend_finished (backend);
diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp
index 2a84a3b..aec568c 100644
--- a/backends/zypp/zypp-utils.cpp
+++ b/backends/zypp/zypp-utils.cpp
@@ -569,7 +569,7 @@ zypp_find_arch_update_item (const zypp::ResPool & pool, zypp::PoolItem item)
 }
 
 std::set<zypp::PoolItem> *
-zypp_get_updates ()
+zypp_get_updates (std::string repo)
 {
         std::set<zypp::PoolItem> *pks = new std::set<zypp::PoolItem> ();
         zypp::ResPool pool = zypp::ResPool::instance ();
@@ -584,7 +584,12 @@ zypp_get_updates ()
                 zypp::PoolItem candidate =  zypp_find_arch_update_item (pool, *it);
                 if (!candidate.resolvable ())
                         continue;
-                pks->insert (candidate);
+		if (repo.empty ()) {
+	                pks->insert (candidate);
+		}else{
+			if (candidate->repoInfo ().alias ().compare (repo) != 0)
+				pks->insert (candidate);
+		}
         }
 
         return pks;
@@ -604,7 +609,7 @@ zypp_get_patches ()
         for (zypp::ResPoolProxy::const_iterator it = zypp->poolProxy ().byKindBegin<zypp::Patch>();
                         it != zypp->poolProxy ().byKindEnd<zypp::Patch>(); it ++) {
                 // check if patch is needed 
-                if((*it)->candidateObj ().isBroken()) {
+                if((*it)->candidateObj ().isRelevant() && !((*it)->candidateObj ().isSatisfied())) {
                         patches->insert ((*it)->candidateObj ());
 			zypp::Patch::constPtr patch = zypp::asKind<zypp::Patch>((*it)->candidateObj ().resolvable ());
 
diff --git a/backends/zypp/zypp-utils.h b/backends/zypp/zypp-utils.h
index 0282aa4..d0361ea 100644
--- a/backends/zypp/zypp-utils.h
+++ b/backends/zypp/zypp-utils.h
@@ -137,9 +137,9 @@ gboolean zypp_signature_required (PkBackend *backend, const std::string &file, c
 zypp::PoolItem zypp_find_arch_update_item (const zypp::ResPool & pool, zypp::PoolItem item);
 
 /**
-  * Returns a set of all packages the could be updated
+  * Returns a set of all packages the could be updated (you're able to exclude a repo)
   */
-std::set<zypp::PoolItem> * zypp_get_updates ();
+std::set<zypp::PoolItem> * zypp_get_updates (std::string repo);
 
 /**
   * Returns a set of all patches the could be installed

Places

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

Places