diff options
author | Håkon Hallingstad <hakon@yahooinc.com> | 2023-08-07 09:41:29 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahooinc.com> | 2023-08-07 09:41:29 +0200 |
commit | 69dbb20d21e91fd47d6db7f094f07e35242c108a (patch) | |
tree | a74b5ba1b5fd960319b20f8e021a487c1f700867 | |
parent | 767ee414bfb99df1b40d58b54782be8463f3385a (diff) |
Also ignore dotfiles in ZIP
-rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java index 51b6586087f..9426952f57e 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchive.java @@ -171,13 +171,11 @@ public class SystemFlagsDataArchive { private static void addFile(Builder builder, String rawData, Path filePath, ZoneRegistry zoneRegistry, boolean force) { String filename = filePath.getFileName().toString(); - if (!force) { - if (filename.startsWith(".")) - return; // Ignore files starting with '.' + if (filename.startsWith(".")) + return; // Ignore files starting with '.' - if (!FlagsTarget.filenameForSystem(filename, zoneRegistry.system())) - return; // Ignore files for other systems - } + if (!force && !FlagsTarget.filenameForSystem(filename, zoneRegistry.system())) + return; // Ignore files for other systems FlagId directoryDeducedFlagId = new FlagId(filePath.getName(filePath.getNameCount()-2).toString()); FlagData flagData; |