Commit48f0490

committed

Final (?) fix for tar (null block at end)

Dump template db in dumpall

1 parent03f9e5a commit48f0490Copy full SHA for 48f0490

File tree

+24

-3

lines changed

+24

-3

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,7 @@ static void_CloseArchive(ArchiveHandle* AH)`
`721`	`721`	`lclContextctx= (lclContext)AH->formatData;`
`722`	`722`	`TAR_MEMBER*th;`
`723`	`723`	`RestoreOptions*ropt;`
`724`		`-intsavVerbose;`
	`724`	`+intsavVerbose,i;`
`725`	`725`
`726`	`726`	`if (AH->mode==archModeWrite) {`
`727`	`727`
`@@ -774,6 +774,13 @@ static void_CloseArchive(ArchiveHandle* AH)`
`774`	`774`	`AH->public.verbose=savVerbose;`
`775`	`775`
`776`	`776`	`tarClose(AH,th);`
	`777`	`+`
	`778`	`+/* Add a block of NULLs since it's de-rigeur. */`
	`779`	`+for(i=0;i<512;i++)`
	`780`	`+{`
	`781`	`+fputc(0,ctx->tarFH);`
	`782`	`+}`
	`783`	`+`
`777`	`784`	`}`
`778`	`785`
`779`	`786`	`AH->FH=NULL;`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# and "pg_group" tables, which belong to the whole installation rather`
`7`	`7`	`# than any one individual database.`
`8`	`8`	`#`
`9`		`-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.4 2000/09/08 18:29:27 petere Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.5 2000/10/25 10:21:38 pjw Exp $`
`10`	`10`
`11`	`11`	CMDNAME=`basename$0`
`12`	`12`
`@@ -179,6 +179,20 @@ while read GRONAME GROSYSID GROLIST ; do`
`179`	`179`	`done`
`180`	`180`
`181`	`181`
	`182`	`+# First we dump the template in case there are local extensions.`
	`183`	`+`
	`184`	`+echo`
	`185`	`+echo"--"`
	`186`	`+echo"-- Database template1"`
	`187`	`+echo"--"`
	`188`	`+echo"${BS}connect template1"`
	`189`	`+$PGDUMP"template1"`
	`190`	`+if ["$?"-ne 0 ];then`
	`191`	`+echo"pg_dump failed on template1, exiting"1>&2`
	`192`	`+exit 1`
	`193`	`+fi`
	`194`	`+`
	`195`	`+`
`182`	`196`	`# For each database, run pg_dump to dump the contents of that database.`
`183`	`197`
`184`	`198`	`$PSQL -d template1 -At -F'' \`

Comments

(0)