Attachment 100252 Details for Bug 79515 – [PATCH] Simplify prepared updates file creation

[patch] [PATCH] Simplify prepared updates file creation

0001-Simplify-prepared-updates-file-creation.patch (text/plain), 2.36 KB, created by Kalev Lember on 2014-06-01 20:58:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kalev Lember

Created: 2014-06-01 20:58:34 UTC

Size: 2.36 KB

patch

obsolete

>From 217078855ee2b9b24c1e11cc8441c28f6a3867e2 Mon Sep 17 00:00:00 2001
>From: Kalev Lember <kalevlember@gmail.com>
>Date: Wed, 21 May 2014 23:58:52 +0200
>Subject: [PATCH] Simplify prepared updates file creation
>
>Instead of reading back in the old prepared updates file and then
>carefully appending any new updates, just write the new file from
>scratch. It's easier to do so and makes sure we won't get stale entries
>in the prepared update file.
>---
> src/plugins/pk-plugin-systemd-updates.c | 32 +-------------------------------
> 1 file changed, 1 insertion(+), 31 deletions(-)
>
>diff --git a/src/plugins/pk-plugin-systemd-updates.c b/src/plugins/pk-plugin-systemd-updates.c
>index 5d8dc3c..4032efa 100644
>--- a/src/plugins/pk-plugin-systemd-updates.c
>+++ b/src/plugins/pk-plugin-systemd-updates.c
>@@ -106,40 +106,12 @@ static void
> pk_plugin_transaction_update_packages (PkTransaction *transaction)
> {
> 	GError *error = NULL;
>-	PkPackage *pkg;
>-	PkPackageSack *sack;
> 	gboolean ret;
> 	gchar **package_ids;
> 	gchar *packages_str = NULL;
>-	guint i;
> 
>-	/* get the existing prepared updates */
>-	sack = pk_plugin_get_existing_prepared_updates (PK_OFFLINE_PREPARED_UPDATE_FILENAME);
>-
>-	/* add any new ones */
>+	/* write the package ids to the prepared update file */
> 	package_ids = pk_transaction_get_package_ids (transaction);
>-	for (i = 0; package_ids[i] != NULL; i++) {
>-		/* does this package match exactly */
>-		pkg = pk_package_sack_find_by_id (sack, package_ids[i]);
>-		if (pkg != NULL) {
>-			g_object_unref (pkg);
>-		} else {
>-			/* does this package exist in another version */
>-			pkg = pk_package_sack_find_by_id_name_arch (sack, package_ids[i]);
>-			if (pkg != NULL) {
>-				g_debug ("removing old update %s from prepared updates",
>-					 pk_package_get_id (pkg));
>-				pk_package_sack_remove_package (sack, pkg);
>-				g_object_unref (pkg);
>-			}
>-			g_debug ("adding new update %s to prepared updates",
>-				 package_ids[i]);
>-			pk_package_sack_add_package_by_id (sack, package_ids[i], NULL);
>-		}
>-	}
>-
>-	/* write filename */
>-	package_ids = pk_package_sack_get_ids (sack);
> 	packages_str = g_strjoinv ("\n", package_ids);
> 	ret = g_file_set_contents (PK_OFFLINE_PREPARED_UPDATE_FILENAME,
> 				   packages_str,
>@@ -154,8 +126,6 @@ pk_plugin_transaction_update_packages (PkTransaction *transaction)
> 	}
> out:
> 	g_free (packages_str);
>-	g_object_unref (sack);
>-	g_strfreev (package_ids);
> }
> 
> /**
>-- 
>2.0.0
>

Actions: View | Splinter Review

Attachments on bug 79515: 100252

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.