From f4245483e556c3a31ce53f39c4cfa78c805f85ca Mon Sep 17 00:00:00 2001 From: Vladimir Nadvornik Date: Fri, 27 Jul 2012 16:28:48 +0200 Subject: [PATCH] changed "readonly destination directory" to a warning --- src/filedata.c | 4 ++-- src/typedefs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/filedata.c b/src/filedata.c index b7f260de..18437578 100644 --- a/src/filedata.c +++ b/src/filedata.c @@ -2116,7 +2116,7 @@ gint file_data_verify_ci(FileData *fd) } else if (!access_file(dest_dir, W_OK)) { - ret |= CHANGE_NO_WRITE_PERM_DEST_DIR; + ret |= CHANGE_WARN_NO_WRITE_PERM_DEST_DIR; DEBUG_1("Change checked: destination dir is readonly: %s -> %s", fd->path, fd->change->dest); } else if (!same) @@ -2193,7 +2193,7 @@ gchar *file_data_get_error_string(gint error) g_string_append(result, _("destination can't be overwritten")); } - if (error & CHANGE_NO_WRITE_PERM_DEST_DIR) + if (error & CHANGE_WARN_NO_WRITE_PERM_DEST_DIR) { if (result->len > 0) g_string_append(result, ", "); g_string_append(result, _("destination directory is not writable")); diff --git a/src/typedefs.h b/src/typedefs.h index e3179ccd..2aa740aa 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -158,11 +158,11 @@ typedef enum { CHANGE_WARN_SAME = 1 << 2, CHANGE_WARN_CHANGED_EXT = 1 << 3, CHANGE_WARN_UNSAVED_META = 1 << 4, + CHANGE_WARN_NO_WRITE_PERM_DEST_DIR = 1 << 5, CHANGE_ERROR_MASK = (~0) << 8, /* the values below are fatal errors */ CHANGE_NO_READ_PERM = 1 << 8, CHANGE_NO_WRITE_PERM_DIR = 1 << 9, CHANGE_NO_DEST_DIR = 1 << 10, - CHANGE_NO_WRITE_PERM_DEST_DIR = 1 << 11, CHANGE_NO_WRITE_PERM_DEST = 1 << 12, CHANGE_DEST_EXISTS = 1 << 13, CHANGE_NO_SRC = 1 << 14, -- 2.20.1