r3836 - in branches/nexuiz-2.0: . Docs/server/rcon2irc

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-15 05:24:41 -0400 (Tue, 15 Jul 2008)
New Revision: 3836

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/Docs/server/rcon2irc/rcon2irc.pl
   branches/nexuiz-2.0/branch-manager
Log:
add extra checks to branch-manager
fix rcon2irc syntax errors :(


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-07-15 09:22:05 UTC (rev 3835)
+++ branches/nexuiz-2.0/.patchsets	2008-07-15 09:24:41 UTC (rev 3836)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-3760,3762-3773,3777-3778,3787-3788,3790-3790,3796-3804,3807-3808,3817-3817,3822-3825,3828-3832
+revisions_applied = 1-3760,3762-3773,3777-3778,3787-3788,3790-3790,3796-3804,3807-3808,3817-3817,3822-3825,3828-3835

Modified: branches/nexuiz-2.0/Docs/server/rcon2irc/rcon2irc.pl
===================================================================
--- branches/nexuiz-2.0/Docs/server/rcon2irc/rcon2irc.pl	2008-07-15 09:22:05 UTC (rev 3835)
+++ branches/nexuiz-2.0/Docs/server/rcon2irc/rcon2irc.pl	2008-07-15 09:24:41 UTC (rev 3836)
@@ -365,7 +365,7 @@
 	my ($self) = @_;
 	for(;;)
 	{
-		my $s = $self->{connector}->recv()
+		my $s = $self->{connector}->recv();
 		die "read error\n"
 			if not defined $s;
 		length $s
@@ -647,7 +647,7 @@
 $config{dp_listen} = $dpsock->sockname();
 print "Listening on $config{dp_listen}\n";
 
-$channels->{irc}->throttle(0.5, 5);
+$channels{irc}->throttle(0.5, 5);
 
 
 # Utility routine to write to a channel by name, also outputting what's been written and some status

Modified: branches/nexuiz-2.0/branch-manager
===================================================================
--- branches/nexuiz-2.0/branch-manager	2008-07-15 09:22:05 UTC (rev 3835)
+++ branches/nexuiz-2.0/branch-manager	2008-07-15 09:24:41 UTC (rev 3836)
@@ -255,6 +255,9 @@
 		if not defined $first;
 	$last = $first if not defined $last;
 
+	die "Usage: $0 merge first last"
+		if "$first$last" =~ /[^0-9]/;
+
 	die "There is an uncommitted merge"
 		if -f '.commitmsg';
 
@@ -279,6 +282,10 @@
 	die "Usage: $0 undo first last"
 		if not defined $first;
 	$last = $first if not defined $last;
+
+	die "Usage: $0 merge first last"
+		if "$first$last" =~ /[^0-9]/;
+
 	
 	die "There is an uncommitted merge"
 		if -f '.commitmsg';