From 07afe4b439d50b81996b30fff5d25da807bce5d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 1 Apr 2022 11:28:17 +0200 Subject: [PATCH] Fixes incorrect warning "could not set executable flag" This warning was triggered, when the change was successful. Of course, this should be the other way. --- gradle/changelog/fix_executable_warning.yaml | 2 ++ .../main/java/sonia/scm/repository/spi/ModifyWorkerHelper.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 gradle/changelog/fix_executable_warning.yaml diff --git a/gradle/changelog/fix_executable_warning.yaml b/gradle/changelog/fix_executable_warning.yaml new file mode 100644 index 0000000000..cd577325d8 --- /dev/null +++ b/gradle/changelog/fix_executable_warning.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Incorrect log warning "could not set executable flag" diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/ModifyWorkerHelper.java b/scm-core/src/main/java/sonia/scm/repository/spi/ModifyWorkerHelper.java index 784be5b552..f37a70bd4c 100644 --- a/scm-core/src/main/java/sonia/scm/repository/spi/ModifyWorkerHelper.java +++ b/scm-core/src/main/java/sonia/scm/repository/spi/ModifyWorkerHelper.java @@ -164,7 +164,7 @@ public interface ModifyWorkerHelper extends ModifyCommand.Worker { } boolean executable = Files.isExecutable(targetFile); Files.move(file.toPath(), targetFile, REPLACE_EXISTING); - if (targetFile.toFile().setExecutable(executable)) { + if (!targetFile.toFile().setExecutable(executable)) { LOG.warn("could not set executable flag for file {}", targetFile); } addFileToScm(path, targetFile);