Skip to content

[xaprepare] Add support for Debian trixie release #8127

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

Merged
merged 1 commit into from
Jun 13, 2023
Merged

[xaprepare] Add support for Debian trixie release #8127

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
6 changes: 5 additions & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Debian.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ class LinuxDebian : LinuxDebianCommon
static readonly Dictionary<string, string> DebianUnstableVersionMap = new Dictionary<string, string> (StringComparer.OrdinalIgnoreCase) {
{ "bookworm", "12" },
{ "bookworm/sid", "12" },
{ "trixie", "13" },
{ "trixie/sid", "13" },
};

protected Version DebianRelease { get; private set; } = new Version (0, 0);
Expand Down Expand Up @@ -56,6 +58,7 @@ static bool IsDebian10OrNewer (string? version)
return
version!.IndexOf ("bullseye", StringComparison.OrdinalIgnoreCase) >= 0 ||
version.IndexOf ("bookworm", StringComparison.OrdinalIgnoreCase) >= 0 ||
version.IndexOf ("trixie", StringComparison.OrdinalIgnoreCase) >= 0 ||
version.IndexOf ("sid", StringComparison.OrdinalIgnoreCase) >= 0;
}

Expand All @@ -75,7 +78,8 @@ static bool IsBookwormSidOrNewer (string? debian_version)
return false;
}

return debian_version!.IndexOf ("bookworm", StringComparison.OrdinalIgnoreCase) >= 0;
return debian_version!.IndexOf ("bookworm", StringComparison.OrdinalIgnoreCase) >= 0 ||
debian_version!.IndexOf ("trixie", StringComparison.OrdinalIgnoreCase) >= 0;
}

protected override bool EnsureVersionInformation (Context context)
Expand Down