Strip whitespace from commit SHA #92
Conversation
sbom.py
Outdated
| @@ -104,7 +104,7 @@ def get_release_tools_commit_sha() -> str: | |||
| stdout = subprocess.check_output( | |||
| ["git", "rev-parse", "--prefix", git_prefix, "HEAD"], | |||
| cwd=git_prefix | |||
| ).decode("ascii") | |||
| ).decode("ascii").strip() | |||
| assert re.match(r"^[a-f0-9]{40,}$", stdout) | |||
There was a problem hiding this comment.
This assert is already ensuring that the stdout only contains the hex SHA, with no spaces. In #90 you mentioned that sometimes there might be a newline attached, but from the report it's not clear if you saw this assert fail or if there was some other symptom.
Adding the .strip() makes no harm, so this PR is ok, but if you didn't see the assert fail, then the newline might be coming from some other place.
There was a problem hiding this comment.
I wondered about the too, @Yhg1s did you run into this during the 3.12.2 release?
There was a problem hiding this comment.
Nope, I ran the release with unmodified release-tools sources, and this assert didn't trigger.
There was a problem hiding this comment.
Dang, I feel like I've seen a ghost. Had no idea that $ had this behavior, now I wonder how many subtle bugs are out there.
$: Matches the end of the string or just before the newline at the end of the string
sethmlarson
force-pushed
the
strip-release-tools-commit-sha
branch
from
0f6720d
to
c65d41c
Compare
Closes #90