Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Install rsync to the internal Cygwin installation #5808

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Install rsync to the internal Cygwin installation #5808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ users)
## Plugins

## Init
* Add rsync package to internal Cygwin packages list (enables local pinning and is used by the VCS backends [#5808 @dra27]

## Config report

Expand Down
1 change: 1 addition & 0 deletions src/client/opamInitDefaults.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ let required_packages_for_cygwin =
"patch";
"tar";
"unzip";
"rsync";
] |> List.map OpamSysPkg.of_string

let init_scripts () = [
Expand Down
2 changes: 1 addition & 1 deletion src/state/opamSysInteract.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ let install_packages_commands_t ?(env=OpamVariable.Map.empty) config sys_package
|> OpamStd.String.Set.elements);
`AsUser "rpm", "-q"::"--whatprovides"::packages], None
| Cygwin ->
(* We use setp_x86_64 to install package instead of `cygcheck` that is
(* We use setup_x86_64 to install package instead of `cygcheck` that is
stored in `sys-pkg-manager-cmd` field *)
[`AsUser (OpamFilename.to_string (Cygwin.cygsetup ())),
[ "--root"; (OpamFilename.Dir.to_string (Cygwin.cygroot config));
Expand Down
Loading