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.

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

Use Debian codename for ISSUE_RELEASE if no version number #2986

Merged
merged 1 commit into from
Nov 11, 2023

Conversation

d-torrance
Copy link
Member

This is an issue in Debian testing and unstable, where lsb_release -s --release returns the uninformative "n/a". This causes an extra problem because we end up with a little "a" subdirectory under usr-dist during build.

So for example, now we get "Debian-trixie" as the issue.

This is an issue in Debian testing and unstable, where lsb_release -s
--release returns the uninformative "n/a".  This causes an extra
problem because we end up with a little "a" subdirectory under
usr-dist during build.

So for example, now we get "Debian-trixie" as the issue.
@DanGrayson DanGrayson merged commit 79afff3 into Macaulay2:development Nov 11, 2023
6 checks passed
@mahrud
Copy link
Member

mahrud commented Nov 11, 2023

By the way, this would be the corresponding fix in cmake:

diff --git a/M2/cmake/flavor.cmake b/M2/cmake/flavor.cmake
index 28eab2894e..8201fab4d8 100644
--- a/M2/cmake/flavor.cmake
+++ b/M2/cmake/flavor.cmake
@@ -26,6 +26,11 @@ if(NOT DEFINED ISSUE)
     execute_process(COMMAND ${LSB_RELEASE} -s --release
       OUTPUT_VARIABLE ISSUE_RELEASE
       ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(ISSUE_RELEASE STREQUAL "n/a")
+      execute_process(COMMAND ${LSB_RELEASE} -s --codename
+       OUTPUT_VARIABLE ISSUE_RELEASE
+       ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif()
   elseif(OS_RELEASE)
     file(READ ${OS_RELEASE} _os_release)
     string(REGEX MATCH "ID=([A-Za-z ]*)\n"      _ "${_os_release}")

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants