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

Treat os-family=ubuntu as os-family=debian #4441

Merged
merged 3 commits into from Nov 26, 2020
Merged

Treat os-family=ubuntu as os-family=debian #4441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0e4434
Redirect Ubuntu family to Debian
alan-j-hu Nov 19, 2020
191b06b
Add to changelog: Handle os-family=ubuntu as os-family=debian
alan-j-hu Nov 19, 2020
0f61533
update changes
rjbou Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion master_changes.md
View file
Open in desktop
Expand Up @@ -57,7 +57,8 @@ New option/command/subcommand are prefixed with ◈.
## External dependencies
* Add support for NetBSD and DragonFlyBSD [#4396 @kit-ty-kate]
* Fix OpenBSD, FreeBSD and Gentoo: Allow short names and full name paths for ports-based systems [#4396 @kit-ty-kate]

* Handle the case where `os-family=ubuntu` as `os-family=debian` [#4441 @alan-j-hu]

## Sandbox
*

Expand Down Expand Up @@ -85,6 +86,9 @@ New option/command/subcommand are prefixed with ◈.
## Opam installer
*

## State
*

## Solver
* Fix missing conflict message when trying to remove required packages [#4362 @AltGr]
* Fix the Z3 backend for upgrades [#4393 @AltGr]
Expand Down
2 changes: 1 addition & 1 deletion src/state/opamSysInteract.ml
View file
Open in desktop
Expand Up @@ -118,7 +118,7 @@ let family =
Printf.ksprintf failwith
"External dependency handling not supported for OS family 'bsd'."
end
| "debian" -> Debian
| "debian" | "ubuntu" -> Debian
| "gentoo" -> Gentoo
| "homebrew" -> Homebrew
| "macports" -> Macports
Expand Down