CVS User Account cvsuser
Fri Mar 18 21:40:47 PST 2005
Log Message:
-----------
Backwards-compatibility fix: allow set# to be passed as set\d+ in
addition to \d+.

I accidentally broke this while adding setname support.

Modified Files:
--------------
    slony1-engine/tools/altperl:
        slon-tools.pm (r1.21 -> r1.22)

-------------- next part --------------
Index: slon-tools.pm
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon-tools.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -Ltools/altperl/slon-tools.pm -Ltools/altperl/slon-tools.pm -u -w -r1.21 -r1.22
--- tools/altperl/slon-tools.pm
+++ tools/altperl/slon-tools.pm
@@ -228,7 +228,8 @@
     if ($SLONY_SETS->{$set}) {
 	$match = $SLONY_SETS->{$set};
     }
-    elsif ($set =~ /^\d+$/) {
+    elsif ($set =~ /^(?:set)?(\d+)$/) {
+	$set = $1;
 	my ($name) = grep { $SLONY_SETS->{$_}->{"set_id"} == $set } keys %{$SLONY_SETS};
 	$match = $SLONY_SETS->{$name};
     }
@@ -248,7 +249,6 @@
     return $match->{"set_id"};
 }
 
-
 # This function checks to see if there is a still-in-progress subscription
 # It does so by looking to see if there is a SUBSCRIBE_SET event corresponding
 # to a sl_subscribe entry that is not yet active.


More information about the Slony1-commit mailing list