Movatterモバイル変換

Skip to content

postgrespro/postgresproPublic

NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit0df1dc6

bmomjian

committed

This simple patch fixes broken Makefile, broken ApplySnapshot and

makes all utilities honour --verbose command line option.--Yours, Alexey V. Borzov, Webmaster of RDW.ru

1 parentc666d6f commit0df1dc6Copy full SHA for 0df1dc6

File tree

7 files changed

+15

-3

lines changed

contrib/rserv

7 files changed

+15

-3

lines changed

`‎contrib/rserv/ApplySnapshot.in`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,13 @@ $sinfo = "$sinfo host=$opt_host" if (defined($opt_host));`
`32`	`32`	`$sinfo ="$sinfo user=$opt_user"if (defined($opt_user));`
`33`	`33`	`$sinfo ="$sinfo password=$opt_password"if (defined($opt_password));`
`34`	`34`
`35`		`-my$conn = Pg::connectdb(sinfo);`
	`35`	`+my$conn = Pg::connectdb($sinfo);`
`36`	`36`
`37`	`37`	`my$inpf = new IO::File;`
`38`	`38`	`$inpf =STDIN;`
`39`	`39`
	`40`	`+$RServ::quiet = !$verbose;`
	`41`	`+`
`40`	`42`	`$res = ApplySnapshot ($conn,$inpf);`
`41`	`43`
`42`	`44`	`if ($res > 0)`

`‎contrib/rserv/CleanLog.in`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ print "Slave connection is $sinfo\n" if ($debug);`
`38`	`38`
`39`	`39`	`my$conn = Pg::connectdb($minfo);`
`40`	`40`
	`41`	`+$RServ::quiet = !$verbose;`
	`42`	`+`
`41`	`43`	`$res = CleanLog($conn,$howold);`
`42`	`44`
`43`	`45`	`exit(1)if$res < 0;`

`‎contrib/rserv/GetSyncID.in`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ $sinfo = "$sinfo password=$opt_password" if (defined($opt_password));`
`37`	`37`	`print("Connecting to '$sinfo'\n")if ($debug \|\|$verbose);`
`38`	`38`	`my$conn = Pg::connectdb($sinfo);`
`39`	`39`
	`40`	`+$RServ::quiet = !$verbose;`
	`41`	`+`
`40`	`42`	`$res = GetSyncID($conn);`
`41`	`43`
`42`	`44`	`die"ERROR\n"if$res < 0;`

`‎contrib/rserv/Makefile`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)`
`22`	`22`	`all:$(SQLS)$(TCLS)$(PERLS)$(SCRIPTS)$(SONAME)`
`23`	`23`
`24`	`24`	`%.sql:%.sql.in`
`25`		`-sed's,@MODULE_FILENAME@,$$libdir/$(NAME),g'$<>$@`
	`25`	`+sed's,@MODULE_FILENAME@,$(pkglibdir)/$(SONAME),g'$<>$@`
`26`	`26`
`27`	`27`	`$(PERLS)$(TCLS)$(SCRIPTS):%:%.in`
`28`		`-sed -e's,@MODULE_FILENAME@,$$libdir/$(NAME),g'\`
	`28`	`+sed -e's,@MODULE_FILENAME@,$(pkglibdir)/$(SONAME),g'\`
`29`	`29`	`-e's:@SQLDIR@:$(datadir)/contrib:g'\`
`30`	`30`	`-e's:@BINDIR@:$(bindir):g'\`
`31`	`31`	`-e's:@LIBDIR@:$(datadir)/contrib:g'$<>$@`

`‎contrib/rserv/MasterSync.in`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ $minfo = "$minfo password=$opt_password" if (defined($opt_password));`
`36`	`36`
`37`	`37`	`my$conn = Pg::connectdb($minfo);`
`38`	`38`
	`39`	`+$RServ::quiet = !$verbose;`
	`40`	`+`
`39`	`41`	`$res = SyncSyncID($conn,$server,$syncid);`
`40`	`42`
`41`	`43`	`if ($res == 0)`

`‎contrib/rserv/PrepareSnapshot.in`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ my $conn = Pg::connectdb($minfo);`
`39`	`39`	`my$outf = new IO::File;`
`40`	`40`	`$outf =STDOUT;`
`41`	`41`
	`42`	`+$RServ::quiet = !$verbose;`
	`43`	`+`
`42`	`44`	`$res = PrepareSnapshot ($conn,$outf,$server);`
`43`	`45`
`44`	`46`	`if ($res == 0)`

`‎contrib/rserv/Replicate.in`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ print "Slave connection is $sinfo\n" if ($debug);`
`49`	`49`	`my$mconn = Pg::connectdb($minfo);`
`50`	`50`	`my$sconn = Pg::connectdb($sinfo);`
`51`	`51`
	`52`	`+$RServ::quiet = !$verbose;`
	`53`	`+`
`52`	`54`	`SyncSync($mconn,$sconn);`
`53`	`55`
`54`	`56`	`my$outf = new IO::File;`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp