diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-10-26 19:09:33 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-10-26 19:09:33 +0000 |
| commit | c568ea5cf096c84b16843a59bb4e218723d31d37 (patch) | |
| tree | 1ab246c52cc32556a43248a7e8469977fe9dc0c4 /app-arch/file-roller/files/file-roller-3.8.4-ignore-errors.patch | |
| parent | Fix python dependencies, bug #489230 by Mark R. Pariente and mgorny. Drop old. (diff) | |
| download | gentoo-2-c568ea5cf096c84b16843a59bb4e218723d31d37.tar.gz gentoo-2-c568ea5cf096c84b16843a59bb4e218723d31d37.tar.bz2 gentoo-2-c568ea5cf096c84b16843a59bb4e218723d31d37.zip | |
Apply upstream patches fixing some problems when unpacking (#489074 by Philipp Leonhardt), drop old.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-arch/file-roller/files/file-roller-3.8.4-ignore-errors.patch')
| -rw-r--r-- | app-arch/file-roller/files/file-roller-3.8.4-ignore-errors.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/app-arch/file-roller/files/file-roller-3.8.4-ignore-errors.patch b/app-arch/file-roller/files/file-roller-3.8.4-ignore-errors.patch new file mode 100644 index 000000000000..712ba7497001 --- /dev/null +++ b/app-arch/file-roller/files/file-roller-3.8.4-ignore-errors.patch @@ -0,0 +1,40 @@ +From 80c36ae3c84dce8716eb5b74ddb8c73da5824f13 Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega <paobac@src.gnome.org> +Date: Fri, 11 Oct 2013 19:38:27 +0000 +Subject: ignore errors when setting file attributes + +[bug #709932] +--- +diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c +index 44aaad2..19c5a1d 100644 +--- a/src/fr-archive-libarchive.c ++++ b/src/fr-archive-libarchive.c +@@ -751,7 +751,7 @@ extract_archive_thread (GSimpleAsyncResult *result, + GFileInfo *info; + + info = _g_file_info_create_from_entry (entry, extract_data); +- _g_file_set_attributes_from_info (file, info, cancellable, &load_data->error); ++ _g_file_set_attributes_from_info (file, info, cancellable, NULL); + g_hash_table_insert (created_folders, g_object_ref (file), g_object_ref (info)); + + g_object_unref (info); +@@ -774,7 +774,7 @@ extract_archive_thread (GSimpleAsyncResult *result, + if (r != ARCHIVE_EOF) + load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a)); + else +- _g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, &load_data->error); ++ _g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, NULL); + break; + + case AE_IFLNK: +@@ -805,7 +805,7 @@ extract_archive_thread (GSimpleAsyncResult *result, + } + + if (load_data->error == NULL) +- restore_modification_time (created_folders, cancellable, &load_data->error); ++ restore_modification_time (created_folders, cancellable, NULL); + + if ((load_data->error == NULL) && (r != ARCHIVE_EOF)) + load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a)); +-- +cgit v0.9.2 |