Skip to content

Commit

Permalink
Small corrections.
Browse files Browse the repository at this point in the history
  • Loading branch information
avancinirodrigo committed Sep 27, 2018
1 parent e81a3b8 commit dfda3fc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions packages/base/lua/Directory.lua
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ function Directory(data)
data.fullpath = _Gtme.makePathCompatibleToAllOS(data.fullpath)

if sessionInfo().system == "windows" then
data.fullpath = replaceLatinCharacters(data.fullpath)
data.fullpath = replaceLatinCharacters(data.fullpath) --SKIP
end

if data.fullpath:sub(-1) == "/" then
Expand All @@ -282,9 +282,9 @@ function Directory(data)
table.insert(_Gtme.tmpdirectory__, data)

if sessionInfo().system == "windows" then
data.fullpath = replaceLatinCharacters(cmd)
data.fullpath = replaceLatinCharacters(cmd) --SKIP
else
data.fullpath = cmd
data.fullpath = cmd --SKIP
end
end

Expand Down
2 changes: 1 addition & 1 deletion packages/base/lua/File.lua
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ function File(data)
checkInvalidChars(data:name())

if sessionInfo().system == "windows" then
data.filename = replaceLatinCharacters(data.filename)
data.filename = replaceLatinCharacters(data.filename) --SKIP
end

if isDirectory(data.filename) then
Expand Down
4 changes: 2 additions & 2 deletions packages/gis/tests/functional/alternative/Layer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ return{
name = "conservation"
}
end
unitTest:assertError(patternFileError, "Directory path '"..packageInfo("gis").path.."/data*/".."' cannot contain character '*'.")
unitTest:assertError(patternFileError, "Directory path '"..packageInfo("gis").path.."/data*/".."' contains invalid character '*'.")

patternFileError = function()
Layer{
Expand Down Expand Up @@ -508,7 +508,7 @@ return{
times = {1961, 1974}
}
end
unitTest:assertError(patternFileError, "Directory path '"..packageInfo("gis").path.."/data*/".."' cannot contain character '*'.")
unitTest:assertError(patternFileError, "Directory path '"..packageInfo("gis").path.."/data*/".."' contains invalid character '*'.")

local patternWarning = function()
Layer{
Expand Down

0 comments on commit dfda3fc

Please sign in to comment.