haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: don't double-include package in tar [GH-3637]

This commit is contained in:
Mitchell Hashimoto 2014-05-10 10:36:38 -07:00
parent c7abea2032
commit 47d85d830d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -21,6 +21,7 @@ BUG FIXES:
same name as a real directory. [GH-3732] same name as a real directory. [GH-3732]
- core: Parallelization is more stable, doesn't crash due to to - core: Parallelization is more stable, doesn't crash due to to
bad locks. [GH-3735] bad locks. [GH-3735]
- commands/package: Don't double included files in package. [GH-3637]
- guests/linux: Rsync chown ignores symlinks. [GH-3744] - guests/linux: Rsync chown ignores symlinks. [GH-3744]
- guests/openbsd: Remove '-v' flag from chown for rsync. [GH-3743] - guests/openbsd: Remove '-v' flag from chown for rsync. [GH-3743]
- provisioners/shell: Fix shell provisioner config validation when the - provisioners/shell: Fix shell provisioner config validation when the

2
lib/vagrant/action/general/package.rb
View File

@ -93,7 +93,7 @@ module Vagrant
# Switch into that directory and package everything up # Switch into that directory and package everything up
Util::SafeChdir.safe_chdir(@env["package.directory"]) do Util::SafeChdir.safe_chdir(@env["package.directory"]) do
# Find all the files in our current directory and tar it up! # Find all the files in our current directory and tar it up!
files = Dir.glob(File.join(".", "**", "*")) files = Dir.glob(File.join(".", "*"))
# Package! # Package!
Util::Subprocess.execute("bsdtar", "-czf", output_path, *files) Util::Subprocess.execute("bsdtar", "-czf", output_path, *files)