Skip to content

[Linux] Properly parse single-digit Ubuntu version #5463

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
Jan 7, 2021
Merged

[Linux] Properly parse single-digit Ubuntu version #5463

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 build-tools/xaprepare/xaprepare/Application/Context.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,7 @@ public async Task<bool> Init (string? scenarioName = null)

Log.StatusLine ();
Log.StatusLine (" OS type: ", OS.Type, tailColor: Log.InfoColor);
Log.StatusLine (" OS flavor: ", OS.Flavor, tailColor: Log.InfoColor);
Log.StatusLine (" OS name: ", OS.Name, tailColor: Log.InfoColor);
Log.StatusLine ("OS release: ", OS.Release, tailColor: Log.InfoColor);
Log.StatusLine (" OS bits: ", OS.Architecture, tailColor: Log.InfoColor);
Expand Down
8 changes: 6 additions & 2 deletions build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Ubuntu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,12 @@ protected override bool InitOS ()
{
Version ubuntuRelease;
if (!Version.TryParse (Release, out ubuntuRelease)) {
Log.ErrorLine ($"Unable to parse string '{Release}' as a valid Ubuntu release version");
return false;
if (Int32.TryParse (Release, out int singleNumberVersion)) {
ubuntuRelease = new Version (singleNumberVersion, 0);
} else {
Log.ErrorLine ($"Unable to parse string '{Release}' as a valid {Name} release version");
return false;
}
}
UbuntuRelease = ubuntuRelease;

Expand Down