summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@getchef.com>2015-02-11 15:21:06 -0800
committerdanielsdeleo <dan@getchef.com>2015-02-11 15:21:06 -0800
commit483b2ba1d5a88942af7c40cc176d2c349b4dd27d (patch)
tree5ed1300f550816efae70be6db0293f770ac13446
parentebe864945aacbbfde697ed700590d465cfe17e97 (diff)
downloadchef-483b2ba1d5a88942af7c40cc176d2c349b4dd27d.tar.gz
Include relative URLs in error messages
-rw-r--r--lib/chef/policy_builder/policyfile.rb10
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