Skip to content

Commit

Permalink
Merge pull request ocaml#4978 from kit-ty-kate/zypper-no-upgrade
Browse files Browse the repository at this point in the history
Depexts: Stop zypper from upgrading packages on updates on OpenSUSE
  • Loading branch information
rjbou authored Jan 3, 2022
2 parents 8935eab + a6372cb commit e6b87e1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ users)
in some cases [#4791 @kit-ty-kate - fixes #4790]
* Archlinux: handle virtual package detection [#4831 @rjbou - partial fix #4759]
* Fallback on dnf if yum does not exist on RHEL-based systems [#4825 @kit-ty-kate]
* Stop zypper from upgrading packages on updates on OpenSUSE [#4978 @kit-ty-kate]

## Format upgrade
* Fix format upgrade when there is missing local switches in the config file [#4763 @rjbou - fix #4713] [2.1.0~rc2 #4715]
Expand Down
2 changes: 1 addition & 1 deletion src/state/opamSysInteract.ml
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ let update () =
| Gentoo -> Some ("emerge", ["--sync"])
| Homebrew -> Some ("brew", ["update"])
| Macports -> Some ("port", ["sync"])
| Suse -> Some ("zypper", ["--non-interactive"; "update"])
| Suse -> Some ("zypper", ["--non-interactive"; "refresh"])
| Freebsd | Netbsd | Openbsd ->
None
in
Expand Down

0 comments on commit e6b87e1

Please sign in to comment.