Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
packer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kristopher Ruzic
packer
Commits
404ae53a
Commit
404ae53a
authored
Aug 30, 2013
by
Mitchell Hashimoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
provisioner/salt-masterless: join paths properly
parent
4d42c79d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG.md
CHANGELOG.md
+1
-0
provisioner/salt-masterless/provisioner.go
provisioner/salt-masterless/provisioner.go
+1
-1
No files found.
CHANGELOG.md
View file @
404ae53a
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
BUG FIXES:
BUG FIXES:
*
core: Fix possible panic when ctrl-C during provisioner run.
*
core: Fix possible panic when ctrl-C during provisioner run.
*
provisioners/salt-masterless: Use filepath join to properly join paths.
## 0.3.5 (August 28, 2013)
## 0.3.5 (August 28, 2013)
...
...
provisioner/salt-masterless/provisioner.go
View file @
404ae53a
...
@@ -204,7 +204,7 @@ func UploadLocalDirectory(localDir string, remoteDir string, comm packer.Communi
...
@@ -204,7 +204,7 @@ func UploadLocalDirectory(localDir string, remoteDir string, comm packer.Communi
visitPath
:=
func
(
localPath
string
,
f
os
.
FileInfo
,
err
error
)
(
err2
error
)
{
visitPath
:=
func
(
localPath
string
,
f
os
.
FileInfo
,
err
error
)
(
err2
error
)
{
localRelPath
:=
strings
.
Replace
(
localPath
,
localDir
,
""
,
1
)
localRelPath
:=
strings
.
Replace
(
localPath
,
localDir
,
""
,
1
)
localRelPath
=
strings
.
Replace
(
localRelPath
,
"
\\
"
,
"/"
,
-
1
)
localRelPath
=
strings
.
Replace
(
localRelPath
,
"
\\
"
,
"/"
,
-
1
)
remotePath
:=
f
mt
.
Sprintf
(
"%s%s"
,
remoteDir
,
localRelPath
)
remotePath
:=
f
ilepath
.
Join
(
remoteDir
,
localRelPath
)
if
f
.
IsDir
()
&&
f
.
Name
()
==
".git"
{
if
f
.
IsDir
()
&&
f
.
Name
()
==
".git"
{
return
filepath
.
SkipDir
return
filepath
.
SkipDir
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment