summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-04-02 23:09:26 +0200
committerBram Moolenaar <Bram@vim.org>2014-04-02 23:09:26 +0200
commit57a728d1df7451f5b2b6b1f933182b5af9513d83 (patch)
tree114f3837a75eabbb24cb90ef34d77deba7c8b6b1
parent5a50c2255c447838d08d3b4895a3be3a41cd8eda (diff)
updated for version 7.4.244v7.4.244
Problem: The smack feature causes stray error messages. Solution: Remove the error messages.
-rw-r--r--src/os_unix.c10
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 8 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index b6778f2550..32701fdc78 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2875,14 +2875,8 @@ mch_copy_sec(from_file, to_file)
case ENODATA:
/* no attribute of this name */
ret = removexattr((char*)to_file, name);
- if (ret < 0 && errno != ENODATA)
- {
- MSG_PUTS(_("Could not remove security context "));
- MSG_PUTS(name);
- MSG_PUTS(_(" for "));
- msg_outtrans(to_file);
- msg_putchar('\n');
- }
+ /* Silently ignore errors, apparently this happens when
+ * smack is not actually being used. */
break;
}
}
diff --git a/src/version.c b/src/version.c
index 9881075dd4..da98b0ab99 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 244,
+/**/
243,
/**/
242,