Commit080484d

committed

Merge branch 'PGPROEE9_6' into PGPROEE9_6_MULTIMASTER

2 parents6aa1c9f +21d3520 commit080484dCopy full SHA for 080484d

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ def prepare_extlist(value):`
`19`	`19`	`if"pg_pathman"inl:`
`20`	`20`	`# remove duplicates and reorder extension list to move pg_pathman to tail`
`21`	`21`	`nl=sorted(list(set(l)),cmp=lambdaa,b:1ifa=="pg_pathman"else-1)`
`22`		`-new_value="'{}'".format(",".join(nl))`
	`22`	`+new_value="'{0}'".format(",".join(nl))`
`23`	`23`	`returnnew_value`
`24`	`24`	`else:`
`25`	`25`	`returnvalue`

Lines changed: 2 additions & 1 deletion

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,14 @@`
`1`	`1`	`@echooff`
`2`	`2`	`PATH=C:\Windows\system32;C:\Perl64\bin;C:\Program Files\Git\cmd;C:\msys64\usr\bin`
`3`	`3`
	`4`	`+REM Copy source-repo to CI temporary catalog`
	`5`	`+cp -r postgrespro/* .`
	`6`	`+`
`4`	`7`	`IF"%ARCH%"==""SETARCH=X86`
`5`	`8`	`IF"%ARCH%"=="x86"SETARCH=X86`
`6`	`9`	`IF"%ARCH%"=="x64"SETARCH=X64`
`7`	`10`	`IF"%ARCH%"=="amd64"SETARCH=X64`
	`11`	`+IF"%ARCH%"=="AMD64"SETARCH=X64`
`8`	`12`	`IF"%SDK%"==""SETSDK=SDK71`
`9`	`13`
`10`	`14`	`echo BUILD_ID=%BUILD_ID%`

Comments

(0)