Skip to content

gh-116943: makesetup to allow missing ending line break for Setup files#116945

Closed
temp-repo-259848 wants to merge 4 commits into
python:mainfrom
temp-repo-259848:fix-issue-116943
Closed

gh-116943: makesetup to allow missing ending line break for Setup files#116945
temp-repo-259848 wants to merge 4 commits into
python:mainfrom
temp-repo-259848:fix-issue-116943

Conversation

@temp-repo-259848

@temp-repo-259848 temp-repo-259848 commented Mar 18, 2024

Copy link
Copy Markdown

@ghost

ghost commented Mar 18, 2024

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app

bedevere-app Bot commented Mar 18, 2024

Copy link
Copy Markdown

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

@vstinner

Copy link
Copy Markdown
Member

cc @erlend-aasland

@python-cla-bot

python-cla-bot Bot commented Apr 18, 2025

Copy link
Copy Markdown

The following commit authors need to sign the Contributor License Agreement:

CLA not signed

@erlend-aasland

Copy link
Copy Markdown
Contributor

This is not a problem for most folks; we've had this bash code since 1994. IOW, most people have text editors that add new lines. Either we just update the docs to say that Setup.local must contain EOL, or we simply add an implicit newline in the loop:

diff --git a/Modules/makesetup b/Modules/makesetup
index f6cf695b457..104c824b846 100755
--- a/Modules/makesetup
+++ b/Modules/makesetup
@@ -90,6 +90,7 @@ NL='\
 # Main loop
 for i in ${*-Setup}
 do
+       echo ''  # Add a linebreak so we don't choke on files missing EOL.
        case $i in
        -n)     echo '*noobjects*';;
        *)      echo '*doconfig*'; cat "$i";;

@erlend-aasland

Copy link
Copy Markdown
Contributor

Closing in favour of #139100, and also since the CLA is not signed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants