Author: bdonlan
Date: 2004-06-27 14:54:15 -0400 (Sun, 27 Jun 2004)
New Revision: 258
Modified:
trunk/dev-tools/haver-push/push.conf.sample
trunk/dev-tools/haver-push/push.pl
trunk/dev-tools/haver-push/receive.conf.sample
trunk/dev-tools/haver-push/receive.pl
Log:
* dev-tools/haver-push/push.pl, dev-tools/haver-push/receive.pl,
dev-tools/haver-push/push.conf.sample,
dev-tools/haver-push/receive.conf.sample:
Add $debug option to enable debug output.
Modified: trunk/dev-tools/haver-push/push.conf.sample
===================================================================
--- trunk/dev-tools/haver-push/push.conf.sample 2004-06-27 18:31:46 UTC (rev
257)
+++ trunk/dev-tools/haver-push/push.conf.sample 2004-06-27 18:54:15 UTC (rev
258)
@@ -1,8 +1,9 @@
$repopath = "/home/user/source";
$destaddr = '[EMAIL PROTECTED]';
$fromaddr = '[EMAIL PROTECTED]';
-#$homedir = '/foo';
+#$homedir = '/foo';
$gpgkey = 'DB0F8263';
-$gpgpass = 'foo';
+$gpgpass = 'foo';
$statefile = '/home/user/state';
$mailer = new Mail::Mailer 'smtp', Server => 'localhost';
+#$debug = 1
Modified: trunk/dev-tools/haver-push/push.pl
===================================================================
--- trunk/dev-tools/haver-push/push.pl 2004-06-27 18:31:46 UTC (rev 257)
+++ trunk/dev-tools/haver-push/push.pl 2004-06-27 18:54:15 UTC (rev 258)
@@ -43,6 +43,7 @@
our $gpgpass;
our $statefile;
our $mailer;
+our $debug = 0;
do "push.conf" or die "Reading config file push.conf: $?";
@@ -76,7 +77,7 @@
my $data;
my $err;
my $prevrev = $rev - 1;
- print STDERR "start dump $rev\n";
+ $debug and print STDERR "start dump $rev\n";
run3([
"/usr/bin/svnadmin", "dump", "-r",
"$rev", '--incremental', $repopath
@@ -92,7 +93,7 @@
# ],
# \undef, \$data, \*STDERR
# );
- print STDERR "done dump $?\n";
+ $debug and print STDERR "done dump $?\n";
exit $? if $?;
my $entity = MIME::Entity->build(
Data => Compress::Zlib::memGzip($data),
Modified: trunk/dev-tools/haver-push/receive.conf.sample
===================================================================
--- trunk/dev-tools/haver-push/receive.conf.sample 2004-06-27 18:31:46 UTC
(rev 257)
+++ trunk/dev-tools/haver-push/receive.conf.sample 2004-06-27 18:54:15 UTC
(rev 258)
@@ -2,3 +2,4 @@
$repopath = "/home/user/target";
$gpgkey = '01234567';
#$homedir = '/foo';
+#$debug = 1;
Modified: trunk/dev-tools/haver-push/receive.pl
===================================================================
--- trunk/dev-tools/haver-push/receive.pl 2004-06-27 18:31:46 UTC (rev
257)
+++ trunk/dev-tools/haver-push/receive.pl 2004-06-27 18:54:15 UTC (rev
258)
@@ -33,6 +33,7 @@
our $repopath;
our $gpgkey;
our $homedir;
+our $debug;
do "receive.conf" or die "Loading config file receive.conf: $?";
@@ -40,7 +41,7 @@
my $parser = new MIME::Parser;
$parser->output_dir($tempdir);
-print "Tempdir = $tempdir\n";
+$debug && print STDERR "Tempdir = $tempdir\n";
my $lock = new IO::File "$storedir/lock", "w+"
or die "Can't open lock file: $!";
@@ -59,17 +60,17 @@
my $result = $mg->verify(entity => $entity);
if (!$result->get_is_signed()) {
- print STDERR "Message is not signed.\n";
+ $debug print STDERR "Message is not signed.\n";
exit 1;
}
if (!$result->get_sign_ok()) {
- print STDERR "Signature verification failed.\n";
+ $debug print STDERR "Signature verification failed.\n";
exit 1;
}
if (lc($result->get_sign_key_id()) ne lc($gpgkey)) {
- print STDERR "Wrong key.\n";
+ $debug print STDERR "Wrong key.\n";
return;
}
@@ -105,7 +106,7 @@
my $cur_rev = $youngest + 1;
print "youngest = $youngest, cur_rev = $cur_rev\n";
while (-r "$storedir/r$cur_rev") {
- print STDERR "Applying r$cur_rev\n";
+ $debug print STDERR "Applying r$cur_rev\n";
my $fh = new IO::File "$storedir/r$cur_rev", "r";
local $/;
my $buf = <$fh>;
