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

Merge pull request #5399 from delftswa2014/improve-package-error-message 

Improved the package error message
This commit is contained in:
Seth Vargo 2015-05-30 12:32:19 -07:00
parent 89acb1705c 51842623db
commit 03b945d4d0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,9 +29,10 @@ module Vagrant
def call(env) def call(env)
@env = env @env = env
file_name = File.basename(@env["package.output"].to_s)
raise Errors::PackageOutputDirectory if File.directory?(tar_path) raise Errors::PackageOutputDirectory if File.directory?(tar_path)
raise Errors::PackageOutputExists if File.exist?(tar_path) raise Errors::PackageOutputExists, file_name:file_name if File.exist?(tar_path)
raise Errors::PackageRequiresDirectory if !env["package.directory"] || raise Errors::PackageRequiresDirectory if !env["package.directory"] ||
!File.directory?(env["package.directory"]) !File.directory?(env["package.directory"])

2
templates/locales/en.yml
View File

@ -1749,7 +1749,7 @@ en:
packaging: "Packaging additional file: %{file}" packaging: "Packaging additional file: %{file}"
compressing: "Compressing package to: %{tar_path}" compressing: "Compressing package to: %{tar_path}"
output_exists: |- output_exists: |-
The specified file to save the package as already exists. Please The specified file '%{file_name}' to save the package as already exists. Please
remove this file or specify a different file name for outputting. remove this file or specify a different file name for outputting.
output_is_directory: |- output_is_directory: |-
The specified output is a directory. Please specify a path including The specified output is a directory. Please specify a path including