File PackageKit-0.2.3-to-git20080717.patch of Package PackageKit

Overview Repositories Revisions Requests Users Attributes Meta

File PackageKit-0.2.3-to-git20080717.patch of Package PackageKit (Revision 55e7deb965a56bda8f145d68d6e6c356)

Currently displaying revision 55e7deb965a56bda8f145d68d6e6c356 , Show latest

diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index e666c8e..a1b4051 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -1349,7 +1349,8 @@ backend_get_repo_list (PkBackend *backend, PkFilterEnum filters)
 	std::list <zypp::RepoInfo> repos;
 	try
 	{
-		repos = manager.knownRepositories();
+		//repos = manager.knownRepositories();
+		repos = std::list<zypp::RepoInfo>(manager.repoBegin(),manager.repoEnd());
 	}
 	catch ( const zypp::Exception &e)
 	{
diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp
index 293dba3..47e4e1e 100644
--- a/backends/zypp/zypp-utils.cpp
+++ b/backends/zypp/zypp-utils.cpp
@@ -165,7 +165,8 @@ zypp_build_pool (gboolean include_local)
 	zypp::RepoManager manager;
 	std::list<zypp::RepoInfo> repos;
 	try {
-		repos = manager.knownRepositories ();
+		//repos = manager.knownRepositories ();
+		repos = std::list<zypp::RepoInfo>(manager.repoBegin(),manager.repoEnd());
 		for (std::list<zypp::RepoInfo>::iterator it = repos.begin(); it != repos.end (); it++) {
 			zypp::RepoInfo repo (*it);
 
@@ -861,7 +862,8 @@ zypp_refresh_cache (PkBackend *backend, gboolean force)
 	std::list <zypp::RepoInfo> repos;
 	try
 	{
-		repos = manager.knownRepositories();
+		//repos = manager.knownRepositories();
+		repos = std::list<zypp::RepoInfo>(manager.repoBegin(),manager.repoEnd());
 	}
 	catch ( const zypp::Exception &e)
 	{
diff --git a/client/pk-import-desktop.c b/client/pk-import-desktop.c
index 20bc866..2e5fb9b 100644
--- a/client/pk-import-desktop.c
+++ b/client/pk-import-desktop.c
@@ -132,16 +132,6 @@ pk_desktop_process_desktop (const gchar *package_name, const gchar *filename)
 	gsize len;
 	gchar *locale_temp;
 	static GPtrArray *locale_array = NULL;
-	const gchar *icon_name;
-	const gchar *summary;
-
-	/* can we optimise for the common case? */
-	icon_name = pk_extra_get_icon_name (extra, package_name);
-	summary = pk_extra_get_summary (extra, package_name);
-	if (icon_name != NULL || summary != NULL) {
-		g_print ("PackageName:\t%s\t[skipping]\n", package_name);
-		return;
-	}
 
 	key = g_key_file_new ();
 	ret = g_key_file_load_from_file (key, filename, G_KEY_FILE_KEEP_TRANSLATIONS, NULL);
diff --git a/src/pk-backend.c b/src/pk-backend.c
index 1853c9b..317716e 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -2204,7 +2204,7 @@ libst_backend (LibSelfTest *test)
 	if (text == NULL) {
 		libst_success (test, NULL);
 	} else {
-		libst_failed (test, "invalid name %s", text);
+		libst_failed (test, "invalid name %s (test suite needs to unref backend?)", text);
 	}
 	g_free (text);
 
diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c
index f325f94..ad5b41f 100644
--- a/src/pk-transaction-list.c
+++ b/src/pk-transaction-list.c
@@ -53,7 +53,6 @@ static void     pk_transaction_list_finalize	(GObject        *object);
 struct PkTransactionListPrivate
 {
 	GPtrArray		*array;
-	gchar			*current_tid;
 };
 
 typedef struct {
@@ -135,24 +134,18 @@ pk_transaction_list_role_present (PkTransactionList *tlist, PkRoleEnum role)
 }
 
 /**
- * pk_transaction_list_remove:
+ * pk_transaction_list_remove_internal:
  **/
 gboolean
-pk_transaction_list_remove (PkTransactionList *tlist, PkTransaction *transaction)
+pk_transaction_list_remove_internal (PkTransactionList *tlist, PkTransactionItem *item)
 {
 	gboolean ret;
-	PkTransactionItem *item;
 
 	g_return_val_if_fail (PK_IS_TRANSACTION_LIST (tlist), FALSE);
-	g_return_val_if_fail (transaction != NULL, FALSE);
+	g_return_val_if_fail (item != NULL, FALSE);
 
-	item = pk_transaction_list_get_from_transaction (tlist, transaction);
-	if (item == NULL) {
-		pk_warning ("could not get item");
-		return FALSE;
-	}
 	/* valid item */
-	pk_debug ("remove transaction %p, item %p", item->transaction, item);
+	pk_debug ("remove transaction %s, item %p", item->tid, item);
 	ret = g_ptr_array_remove (tlist->priv->array, item);
 	if (ret == FALSE) {
 		pk_warning ("could not remove %p as not present in list", item);
@@ -161,10 +154,34 @@ pk_transaction_list_remove (PkTransactionList *tlist, PkTransaction *transaction
 	g_object_unref (item->transaction);
 	g_free (item->tid);
 	g_free (item);
-
 	return TRUE;
 }
 
+/**
+ * pk_transaction_list_remove:
+ **/
+gboolean
+pk_transaction_list_remove (PkTransactionList *tlist, PkTransaction *transaction)
+{
+	PkTransactionItem *item;
+	gboolean ret;
+
+	g_return_val_if_fail (PK_IS_TRANSACTION_LIST (tlist), FALSE);
+	g_return_val_if_fail (transaction != NULL, FALSE);
+
+	item = pk_transaction_list_get_from_transaction (tlist, transaction);
+	if (item == NULL) {
+		pk_warning ("could not get item");
+		return FALSE;
+	}
+	if (item->finished) {
+		pk_warning ("already finished, so waiting to timeout");
+		return FALSE;
+	}
+	ret = pk_transaction_list_remove_internal (tlist, item);
+	return ret;
+}
+
 /* we need this for the finished data */
 typedef struct {
 	PkTransactionList *tlist;
@@ -180,7 +197,7 @@ pk_transaction_list_remove_item_timeout (gpointer data)
 	PkTransactionFinished *finished = (PkTransactionFinished *) data;
 
 	pk_debug ("transaction %s completed, removing", finished->item->tid);
-	pk_transaction_list_remove (finished->tlist, finished->item->transaction);
+	pk_transaction_list_remove_internal (finished->tlist, finished->item);
 	g_free (finished);
 	return FALSE;
 }
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 8e318c7..97875a7 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -1153,7 +1153,7 @@ pk_transaction_cancel (PkTransaction *transaction, GError **error)
 	g_return_val_if_fail (PK_IS_TRANSACTION (transaction), FALSE);
 	g_return_val_if_fail (transaction->priv->tid != NULL, FALSE);
 
-	pk_debug ("Cancel method called");
+	pk_debug ("Cancel method called on %s", transaction->priv->tid);
 
 	/* if it's never been run, just remove this transaction from the list */
 	if (!transaction->priv->has_been_run) {

Places

File PackageKit-0.2.3-to-git20080717.patch of Package PackageKit (Revision 55e7deb965a56bda8f145d68d6e6c356)

Places