Commit 59ac9fe
committed
(PUP-4884) Clean forge cache base directory
On Windows the default forge cache base directory is created from Dir.mktmpdir
and contains forward slashes: "C:/Users/josh/AppData/Local/Temp/...".
When unpacking a tarball we check that the entry to be unpacked has the
same prefix. The prefix is the result of File.expand_path, which also
returns a path with forward slashes. When the cache base directory is
changed to a Windows native path, e.g. C:\Temp, to work around long file
path issues, the check will fail.
This commit cleans the base_dir and the tar entry, so that the comparison
is always done using forward slashes.1 parent 2b0a129 commit 59ac9fe
File tree
3 files changed
+3
-4
lines changed- lib/puppet
- forge
- module_tool/tar
- spec/unit/module_tool/applications
3 files changed
+3
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
| 50 | + | |
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | | - | |
| 110 | + | |
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | | - | |
| 37 | + | |
39 | 38 | | |
40 | 39 | | |
41 | 40 | | |
| |||
0 commit comments