xserver: Branch 'master'

[Adam Jackson]

 os/log.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6dcb73375e0ce389315d55587623eb84e9d13543
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 6 10:03:23 2016 -0500

    os: Failure to remove a non-existent log file is not an error
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/os/log.c b/os/log.c
index 6168d59..91e55a5 100644
--- a/os/log.c
+++ b/os/log.c
@@ -218,7 +218,7 @@ LogFilePrep(const char *fname, const char *backup, const char *idstring)
         }
     }
     else {
-        if (remove(logFileName) != 0) {
+        if (remove(logFileName) != 0 && errno != ENOENT) {
             FatalError("Cannot remove old log file \"%s\": %s\n",
                        logFileName, strerror(errno));
         }