summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorScott Hain <shain@chef.io>2016-04-26 14:10:13 -0700
committerScott Hain <shain@chef.io>2016-04-26 14:10:13 -0700
commitd3cdbd0d0fade10c4c11fe2c4ca2c3ff884e3183 (patch)
tree285a08c7304b6e3e45c1532fe6a6eea5e2848cb5 /omnibus
parentb02edf03573d1a0b08cc44625eb1e65e8aa18fb4 (diff)
parenta88ff4f95f2b881a52e1820446b3973f6b561faf (diff)
downloadchef-d3cdbd0d0fade10c4c11fe2c4ca2c3ff884e3183.tar.gz
Merge pull request #4864 from chef/shain/fix_dependency_path
Update override path
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/config/projects/chef.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index fa6f30b322..561dea8901 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -22,6 +22,9 @@ license "Apache-2.0"
license_file "../LICENSE"
build_iteration 1
+# Do not use __FILE__ after this point, use current_file. If you use __FILE__
+# after this point, any dependent defs (ex: angrychef) that use instance_eval
+# will fail to work correctly.
current_file ||= __FILE__
version_file = File.expand_path("../../../../VERSION", current_file)
build_version IO.read(version_file).strip
@@ -42,7 +45,7 @@ if windows? || rhel?
end
# Load dynamically updated overrides
-overrides_path = File.expand_path("../../../../omnibus_overrides.rb", __FILE__)
+overrides_path = File.expand_path("../../../../omnibus_overrides.rb", current_file)
instance_eval(IO.read(overrides_path), overrides_path)
override :"ruby-windows-devkit", version: "4.5.2-20111229-1559" if windows? && windows_arch_i386?