stellar / packages

SDF - Packages
Apache License 2.0
46 stars 41 forks source link

Correct context to reflect recent sed change from / to @ in useLocalPackageVersion.diff #198

Closed graydon closed 1 year ago

graydon commented 1 year ago

In stellar-core PR https://github.com/stellar/stellar-core/pull/3751 the sed command (embedded in Makefile.am) used to splice version strings into core was changed from using / to using @ so that the version string can contain a / (as it does when it's a github PR or other complex git ref).

The line of code this sed command occurs on is unfortunately captured over here as well, as a context line for a diff that we apply when packaging stellar-core: we slightly modify the Makefile.am to use the package and jenkins build version we're building rather than the git-derived local build version number. Since the sed line changed, this patch no longer applies, and the package build fails.

This change just updates the sed command captured in the context of that diff to reflect the change made on core. It's not the prettiest way to fix the problem but hopefully it will unblock the build.

marta-lokhova commented 1 year ago

r+ b2f35ab3ca9ea0ee9be506aea4b334d77b49407d