Merge remote-tracking branch 'origin/candidate-9.0.x' into candidate-…

…9.2.x Signed-off-by: Jake Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
hpcc-systems · May 17, 2024 · a6df798 · a6df798
2 parents bbc2432 + 8b94768
commit a6df798
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/common/thorhelper/roxiehelper.cpp b/common/thorhelper/roxiehelper.cpp
@@ -2766,7 +2766,7 @@ StringBuffer & expandLogicalFilename(StringBuffer & logicalName, const char * fn
         CDfsLogicalFileName dlfn;
         dlfn.setAllowWild(true);
         dlfn.setAllowTrailingEmptyScope(true);
-        dlfn.set(fname+1);
+        dlfn.set(fname+1, false, true);
         logicalName.append(dlfn.get(ignoreForeignPrefix));
     }
     else if (resolveLocally)
@@ -2792,7 +2792,7 @@ StringBuffer & expandLogicalFilename(StringBuffer & logicalName, const char * fn
         CDfsLogicalFileName dlfn;
         dlfn.setAllowWild(true);
         dlfn.setAllowTrailingEmptyScope(true);
-        dlfn.set(lfn.str());
+        dlfn.set(lfn.str(), false, true);
         logicalName.append(dlfn.get());
     }
     return logicalName;

diff --git a/dali/base/dautils.cpp b/dali/base/dautils.cpp
@@ -905,7 +905,7 @@ bool CDfsLogicalFileName::normalizeExternal(const char * name, StringAttr &res,
     return true;
 }
 
-void CDfsLogicalFileName::set(const char *name, bool removeForeign)
+void CDfsLogicalFileName::set(const char *name, bool removeForeign, bool skipAddRootScopeIfNone)
 {
     clear();
     if (!name)
@@ -951,7 +951,7 @@ void CDfsLogicalFileName::set(const char *name, bool removeForeign)
         external = true;
     else
     {
-        normalizeName(name, lfn, false, true);
+        normalizeName(name, lfn, false, !skipAddRootScopeIfNone);
         if (removeForeign)
         {
             StringAttr _lfn = get(true);

diff --git a/dali/base/dautils.hpp b/dali/base/dautils.hpp
@@ -71,7 +71,7 @@ class da_decl CDfsLogicalFileName
     ~CDfsLogicalFileName();
 
     CDfsLogicalFileName & operator = (CDfsLogicalFileName const &from);
-    void set(const char *lfn, bool removeForeign=false); // throws an exception on invalid filenames
+    void set(const char *lfn, bool removeForeign=false, bool skipAddRootScopeIfNone=false); // throws an exception on invalid filenames
     bool setValidate(const char *lfn, bool removeForeign=false); // returns false for invalid filenames
     void set(const CDfsLogicalFileName &lfn);
     void set(const char *scopes,const char *tail);