Skip to content

Commit baed34c

Browse files
author
Release Manager
committed
gh-37020: `configure`: Fix quoting in system package notice <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> Fixes #37019 <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [ ] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #37020 Reported by: Matthias Köppe Reviewer(s):
2 parents a5b015c + 9bb5fe2 commit baed34c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

m4/sage_spkg_collect.m4

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,12 @@ AC_DEFUN([SAGE_SYSTEM_PACKAGE_NOTICE], [
401401
SYSTEM=$(build/bin/sage-guess-package-system 2>& AS_MESSAGE_FD)
402402
AC_MSG_RESULT([$SYSTEM])
403403
AS_IF([test $SYSTEM != unknown], [
404+
print_sys () {
405+
build/bin/sage-print-system-package-command $SYSTEM --verbose=" " --prompt=" $ " --sudo "$[@]"
406+
}
404407
SYSTEM_PACKAGES=$(build/bin/sage-get-system-packages $SYSTEM $SAGE_NEED_SYSTEM_PACKAGES)
405408
AS_IF([test -n "$SYSTEM_PACKAGES"], [
406-
PRINT_SYS="build/bin/sage-print-system-package-command $SYSTEM --verbose=\" \" --prompt=\" \$ \" --sudo"
407-
COMMAND=$(eval "$PRINT_SYS" update && eval "$PRINT_SYS" install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" eval "$PRINT_SYS" setup-build-env )
409+
COMMAND=$(print_sys update && print_sys install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" print_sys setup-build-env)
408410
AC_MSG_NOTICE([
409411
410412
hint: installing the following system packages, if not
@@ -417,8 +419,7 @@ $COMMAND
417419
])
418420
SYSTEM_PACKAGES=$(build/bin/sage-get-system-packages $SYSTEM $SAGE_NEED_SYSTEM_PACKAGES_OPTIONAL)
419421
AS_IF([test -n "$SYSTEM_PACKAGES"], [
420-
PRINT_SYS="build/bin/sage-print-system-package-command $SYSTEM --verbose=\" \" --prompt=\" \$ \" --sudo"
421-
COMMAND=$(eval "$PRINT_SYS" update && eval "$PRINT_SYS" install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" eval "$PRINT_SYS" setup-build-env )
422+
COMMAND=$(print_sys update && print_sys install $SYSTEM_PACKAGES && SAGE_ROOT="$SAGE_ROOT" print_sys setup-build-env)
422423
AC_MSG_NOTICE([
423424
424425
hint: installing the following system packages, if not

0 commit comments

Comments
 (0)