diff options
| author | danielsdeleo <dan@getchef.com> | 2015-02-11 15:21:06 -0800 |
|---|---|---|
| committer | danielsdeleo <dan@getchef.com> | 2015-02-12 08:40:56 -0800 |
| commit | 728ce8d7ab8b83174b7d5ebabdd5aefb5600cdde (patch) | |
| tree | e4d71047a30a3291964f8268c98251165312fb1c /lib/chef | |
| parent | 3cf27d446c8f0777de4920fb065f7a8e6ce70261 (diff) | |
| download | chef-728ce8d7ab8b83174b7d5ebabdd5aefb5600cdde.tar.gz | |
Include relative URLs in error messages
Diffstat (limited to 'lib/chef')
| -rw-r--r-- | lib/chef/policy_builder/policyfile.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb index 26c4f0c6c8..d368b055f7 100644 --- a/lib/chef/policy_builder/policyfile.rb +++ b/lib/chef/policy_builder/policyfile.rb @@ -358,9 +358,10 @@ class Chef def compat_mode_manifest_for(cookbook_name, lock_data) xyz_version = lock_data["dotted_decimal_identifier"] - http_api.get("cookbooks/#{cookbook_name}/#{xyz_version}") + rel_url = "cookbooks/#{cookbook_name}/#{xyz_version}" + http_api.get(rel_url) rescue Exception => e - message = "Error loading cookbook #{cookbook_name} at version #{xyz_version}: #{e.class} - #{e.message}" + message = "Error loading cookbook #{cookbook_name} at version #{xyz_version} from #{rel_url}: #{e.class} - #{e.message}" err = Chef::Exceptions::CookbookNotFound.new(message) err.set_backtrace(e.backtrace) raise err @@ -368,9 +369,10 @@ class Chef def artifact_manifest_for(cookbook_name, lock_data) xyz_version = lock_data["dotted_decimal_identifier"] - http_api.get("cookbook_artifacts/#{cookbook_name}/#{xyz_version}") + rel_url = "cookbook_artifacts/#{cookbook_name}/#{xyz_version}" + http_api.get(rel_url) rescue Exception => e - message = "Error loading cookbook #{cookbook_name} at version #{xyz_version}: #{e.class} - #{e.message}" + message = "Error loading cookbook #{cookbook_name} at version #{xyz_version} from #{rel_url}: #{e.class} - #{e.message}" err = Chef::Exceptions::CookbookNotFound.new(message) err.set_backtrace(e.backtrace) raise err |