changed "readonly destination directory" to a warning
authorVladimir Nadvornik <nadvornik@suse.cz>
Fri, 27 Jul 2012 14:28:48 +0000 (16:28 +0200)
committerVladimir Nadvornik <nadvornik@suse.cz>
Fri, 27 Jul 2012 14:28:48 +0000 (16:28 +0200)
src/filedata.c
src/typedefs.h

index b7f260d..1843757 100644 (file)
@@ -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"));
index e3179cc..2aa740a 100644 (file)
@@ -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,