From 02d060d0f75b15114df0cd31a6d1017e1fee86a1 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 31 Aug 2022 21:33:45 -0400 Subject: [PATCH] Port regress-python3-mangle.mk to Solaris "sed", redux. Per experimentation and buildfarm failures, Solaris' "sed" has got some kind of problem with regexes that use both '*' and '[[:alpha:]]'. We can work around that by replacing '[[:alpha:]]' with '[a-zA-Z]', which is plenty good enough for our purposes, especially since this is only needed in long-stable branches. I chose to flat-out remove the second pattern of this sort, 's/except \([a-zA-Z][a-zA-Z.]*\), *\([a-zA-Z][a-zA-Z]*\):/except \1 as \2:/g' because we haven't needed it since 8.4. Follow-on to c3556f6fa, which probably missed catching this because the problematic pattern was already gone when that patch was written. Patch v10-v12 only, as the problem manifests only there. We have a line of dead code in v13-v14, which isn't worth changing, and the whole mess is gone as of v15. Discussion: https://postgr.es/m/165561.1661984701@sss.pgh.pa.us --- src/pl/plpython/regress-python3-mangle.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pl/plpython/regress-python3-mangle.mk b/src/pl/plpython/regress-python3-mangle.mk index d5f805d1cb4..f78238743cd 100644 --- a/src/pl/plpython/regress-python3-mangle.mk +++ b/src/pl/plpython/regress-python3-mangle.mk @@ -14,8 +14,7 @@ REGRESS := $(foreach test,$(REGRESS),$(if $(filter $(test),$(REGRESS_PLPYTHON3_M pgregress-python3-mangle: $(MKDIR_P) sql/python3 expected/python3 results/python3 for file in $(patsubst %,$(srcdir)/sql/%.sql,$(REGRESS_PLPYTHON3_MANGLE)) $(patsubst %,$(srcdir)/expected/%*.out,$(REGRESS_PLPYTHON3_MANGLE)); do \ - sed -e 's/except \([[:alpha:]][[:alpha:].]*\), *\([[:alpha:]][[:alpha:]]*\):/except \1 as \2:/g' \ - -e "s///g" \ + sed -e 's/except \([a-zA-Z][a-zA-Z.]*\), *\([a-zA-Z][a-zA-Z]*\):/except \1 as \2:/g' \ -e "s///g" \ -e "s/\([0-9][0-9]*\)L/\1/g" \ -e 's/\([ [{]\)u"/\1"/g' \