Marcus Meissner
98b2ad1ede
- Update to 4.8.31
- Core
* Minimal version of GLib is 2.32.0.
- VFS
* fish: drop support of native FISH server and protocol. Rename VFS to shell (#4232)
* extfs;
- uc1541 extfs: update up to 3.6 version (#4511)
- s3+: port to Python3 (#4324)
* Support for LZO/LZOP compression format (#4509)
- Misc
* Skins: add color for non-printable characters in editor (#4433)
- Fixes
* FTBFS on FreeBSD with ext2fs attribute support (#4493)
* Broken stickchars (-a) mode (#4498)
* Wrong timestamp after resuming of file copy operation (#4499)
* Editor: wrong deletion of marked column (#3761)
* Diff viewer: segfault when display of line numbers is enabled (#4500)
* Tar VFS: broken handling of hard links (#4494)
* Sftp VFS: failure establishing SSH session due hashed host names in ~/.ssh/known_hosts (#4506)
* Shell VFS: incorrect file names with cyrillic or diacritic symbols (#4507)
* mc.ext.ini: incorrect description of of how multiple sections and keys with same names are processed (#4497)
* mc.ext.ini: unescaped backslash \ is treated as invalid escape sequence in glib-2.77.3 and glib-2.79 (#4502)
* mc.ext.ini: file "Makefile.zip" is handled as Makefile not as zip-arhive (#4419)
- Rebase mc-ext-audio.patch, mc-extd-xdg.patch and
mc-vfs-fish-deleted_source_file.patch
OBS-URL: https://build.opensuse.org/request/show/1142182
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=152
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
Index: mc-4.8.31/src/filemanager/file.c
|
|
===================================================================
|
|
--- mc-4.8.31.orig/src/filemanager/file.c
|
|
+++ mc-4.8.31/src/filemanager/file.c
|
|
@@ -2744,6 +2744,8 @@ copy_file_file (file_op_total_context_t
|
|
continue;
|
|
if (temp_status == FILE_ABORT)
|
|
return_status = temp_status;
|
|
+ if (temp_status == FILE_SKIP)
|
|
+ return_status = temp_status;
|
|
if (temp_status == FILE_SKIPALL)
|
|
ctx->skip_all = TRUE;
|
|
break;
|
|
@@ -2754,6 +2756,8 @@ copy_file_file (file_op_total_context_t
|
|
temp_status = file_error (TRUE, _("Cannot close target file \"%s\"\n%s"), dst_path);
|
|
if (temp_status == FILE_RETRY)
|
|
continue;
|
|
+ if (temp_status == FILE_SKIP)
|
|
+ return_status = temp_status;
|
|
if (temp_status == FILE_SKIPALL)
|
|
ctx->skip_all = TRUE;
|
|
return_status = temp_status;
|
|
@@ -2785,10 +2789,10 @@ copy_file_file (file_op_total_context_t
|
|
if (temp_status == FILE_SKIPALL)
|
|
{
|
|
ctx->skip_all = TRUE;
|
|
- return_status = FILE_CONT;
|
|
+ return_status = FILE_SKIPALL;
|
|
}
|
|
if (temp_status == FILE_SKIP)
|
|
- return_status = FILE_CONT;
|
|
+ return_status = FILE_SKIP;
|
|
break;
|
|
}
|
|
|
|
@@ -2801,10 +2805,10 @@ copy_file_file (file_op_total_context_t
|
|
if (temp_status == FILE_SKIPALL)
|
|
{
|
|
ctx->skip_all = TRUE;
|
|
- return_status = FILE_CONT;
|
|
+ return_status = FILE_SKIPALL;
|
|
}
|
|
if (temp_status == FILE_SKIP)
|
|
- return_status = FILE_CONT;
|
|
+ return_status = FILE_SKIP;
|
|
break;
|
|
}
|
|
|