maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #547 from pulumi/AssetBugs

Browse source 
Fix an archive-related bug.
This commit is contained in:
Pat Gavlin 2017-11-10 20:42:33 -08:00 committed by GitHub
parent f2e658e1b7 8c7932c1b5
commit eec99c3ca9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/resource/asset.go
View file

@ -683,15 +683,18 @@ func (a *Archive) readPath() (ArchiveReader, error) {
return fileerr
}
// If this was a directory or a symlink, skip it.
if f.IsDir() || f.Mode()&os.ModeSymlink != 0 {
// If this is a .pulumi directory, we will skip this by default.
// TODO[pulumi/pulumi#122]: when we support .pulumiignore, this will be customizable.
if f.Name() == workspace.BookkeepingDir {
if f.IsDir() {
return filepath.SkipDir
}
return nil
}
// Finally, if this was a .pulumi directory, we will skip this by default.
// TODO[pulumi/pulumi#122]: when we support .pulumiignore, this will be customizable.
if !f.IsDir() && f.Name() == workspace.BookkeepingDir {
return filepath.SkipDir
// If this was a directory or a symlink, skip it.
if f.IsDir() || f.Mode()&os.ModeSymlink != 0 {
return nil
}
// Otherwise, add this asset to the list of paths and keep going.