diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-18 22:28:18 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:48:29 -0700 |
| commit | fe81decc5336a540ba9e65e0da48f5a5e3b52274 (patch) | |
| tree | 4163826f9de704395b85cdb9c52aaa75bd692c29 /spec/unit/indirector | |
| parent | a4378128c214d3c8c349a8052f018c13417b7cb1 (diff) | |
| download | puppet-fe81decc5336a540ba9e65e0da48f5a5e3b52274.tar.gz puppet-fe81decc5336a540ba9e65e0da48f5a5e3b52274.tar.xz puppet-fe81decc5336a540ba9e65e0da48f5a5e3b52274.zip | |
(#8489) Consistently use File::PATH_SEPARATOR
Puppet uses both colon and File::PATH_SEPARATOR in various places, which
does not work on Windows, where File::PATH_SEPARATOR is a semi-colon. This
commit changes the code and tests to consistently use File::PATH_SEPARATOR.
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
(cherry picked from commit 26ee468e8b963d63933d9a27a65d55510ff87618)
Diffstat (limited to 'spec/unit/indirector')
| -rwxr-xr-x | spec/unit/indirector/resource_type/parser_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/unit/indirector/resource_type/parser_spec.rb b/spec/unit/indirector/resource_type/parser_spec.rb index c4fc455a0..fa2aa10b8 100755 --- a/spec/unit/indirector/resource_type/parser_spec.rb +++ b/spec/unit/indirector/resource_type/parser_spec.rb @@ -128,7 +128,7 @@ describe Puppet::Indirector::ResourceType::Parser do second = File.join(dir, "second") FileUtils.mkdir_p(first) FileUtils.mkdir_p(second) - Puppet[:modulepath] = "#{first}:#{second}" + Puppet[:modulepath] = "#{first}#{File::PATH_SEPARATOR}#{second}" # Make a new request, since we've reset the env @request = Puppet::Indirector::Request.new(:resource_type, :search, "*") |