Merge pull request #4441 from alan-j-hu/mint-ubuntu

Treat os-family=ubuntu as os-family=debian
ocaml · Nov 26, 2020 · 0f9d3c9 · 0f9d3c9
2 parents e93dd4a + 0f61533
commit 0f9d3c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -58,7 +58,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
   *
 
@@ -86,6 +87,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]

diff --git a/src/state/opamSysInteract.ml b/src/state/opamSysInteract.ml
@@ -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