File appstream-glib-duplicates.patch of Package appstream-glib

Overview Repositories Revisions Requests Users Attributes Meta

File appstream-glib-duplicates.patch of Package appstream-glib (Revision f974e620b4af57ee7cc4e30cc7ba771b)

Currently displaying revision f974e620b4af57ee7cc4e30cc7ba771b , Show latest

From 473f3ab19f91e13014d6cefdbf57209337a6d407 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 13 Nov 2017 10:31:36 +0000
Subject: [PATCH] Do not try to extract duplicate files in the icon theme
 packages

Fixes an extraction issue when using OpenSUSE.
---
 libappstream-builder/asb-utils.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libappstream-builder/asb-utils.c b/libappstream-builder/asb-utils.c
index 82d94a4..f1b48e9 100644
--- a/libappstream-builder/asb-utils.c
+++ b/libappstream-builder/asb-utils.c
@@ -411,6 +411,11 @@ asb_utils_explode (const gchar *filename,
 		valid = asb_utils_explode_file (entry, dir);
 		if (!valid)
 			continue;
+		if (g_file_test (archive_entry_pathname (entry), G_FILE_TEST_EXISTS)) {
+			g_debug ("skipping as %s already exists",
+				 archive_entry_pathname (entry));
+			continue;
+		}
 		if (archive_entry_symlink (entry) == NULL) {
 			archive_entry_set_mode (entry, S_IRGRP | S_IWGRP |
 						       S_IRUSR | S_IWUSR);
-- 
2.14.3

Places

File appstream-glib-duplicates.patch of Package appstream-glib (Revision f974e620b4af57ee7cc4e30cc7ba771b)

Places