Skip to content

Commit 6d8f384

Browse files
committed
Always pass --site with unsafe-yes
1 parent e8ae49b commit 6d8f384

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

master_changes.md

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ users)
5959
## Opamfile
6060

6161
## External dependencies
62+
* Correct flags passed to Cygwin setup for external installations [#6046 @dra27 fixes #6041]
6263

6364
## Format upgrade
6465

src/state/opamSysInteract.ml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1039,9 +1039,7 @@ let install_packages_commands_t ?(env=OpamVariable.Map.empty) config sys_package
10391039
] @ (if Cygwin.is_internal config then
10401040
let common =
10411041
[ "--upgrade-also";
1042-
"--only-site";
10431042
"--no-write-registry";
1044-
"--site"; Cygwin.mirror;
10451043
"--local-package-dir";
10461044
OpamFilename.Dir.to_string (Cygwin.internal_cygcache ());
10471045
]
@@ -1050,7 +1048,10 @@ let install_packages_commands_t ?(env=OpamVariable.Map.empty) config sys_package
10501048
"--symlink-type" :: "native" :: common
10511049
else
10521050
common
1053-
else [])
1051+
else []) @ (if Cygwin.is_internal config || unsafe_yes then
1052+
[ "--only-site";
1053+
"--site"; Cygwin.mirror;
1054+
])
10541055
],
10551056
None
10561057
| Debian ->

0 commit comments

Comments
 (0)