diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-29 09:42:57 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:58 -0700 |
| commit | 328eaa2f7fd07ac7059e62d30064ef4b70f1f89f (patch) | |
| tree | d2c96796ef8b67009c7e9e83bb6ba164ecfaf327 /spec/unit/type/resources_spec.rb | |
| parent | 088c7ac8632ee7137e86a15f28a75a7abbc0d252 (diff) | |
| download | puppet-328eaa2f7fd07ac7059e62d30064ef4b70f1f89f.tar.gz puppet-328eaa2f7fd07ac7059e62d30064ef4b70f1f89f.tar.xz puppet-328eaa2f7fd07ac7059e62d30064ef4b70f1f89f.zip | |
(#8660) Fix destdir option on Windows
Specifying the --destdir option failed on windows because the install
script attempted to concatenate two absolute paths together. On Unix,
this is fine, but on Windows, it fails because the colon (part of the
drive specifier) is not a valid filename character. This commit adds a
method to join two paths, stripping off the drive specifier, if
present.
Also fixed a minor bug, which caused a deprecation warning to always
be printed when the --destdir option is omitted, which is the default
case.
Reviewed-by: Cameron Thomas <cameron@puppetlabs.com>
(cherry picked from commit f6006177a85766cfb3387db6c3d337bf97b52f17)
Diffstat (limited to 'spec/unit/type/resources_spec.rb')
0 files changed, 0 insertions, 0 deletions