pf-tools commit: r590 [ccaillet-guest] - in /trunk/lib/PFTools: Conf.pm Net.pm
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Wed Mar 19 09:04:02 UTC 2008
Author: ccaillet-guest
Date: Wed Mar 19 09:04:01 2008
New Revision: 590
URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=590
Log:
Fix for use of PFTOOLS_VARS from Conf.pm
Modified:
trunk/lib/PFTools/Conf.pm
trunk/lib/PFTools/Net.pm
Modified: trunk/lib/PFTools/Conf.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Conf.pm?rev=590&op=diff
==============================================================================
--- trunk/lib/PFTools/Conf.pm (original)
+++ trunk/lib/PFTools/Conf.pm Wed Mar 19 09:04:01 2008
@@ -378,7 +378,7 @@
# Traitement des directives IF (1 param)
if (/^\@([^\s]+)\s+([^\s]+)$/) {
if ( $1 eq "ifdef" ) {
- if ( defined( eval $PFTOOLS::Net::PFTOOLS_VARS->{$2} ) ) {
+ if ( defined $PFTOOLS_VARS->{$2} ) {
unshift @cond, ( $#cond > 0 && !$cond[1] ) ? 0 : 1;
}
else {
@@ -387,7 +387,7 @@
next;
}
elsif ( $1 eq "ifndef" ) {
- if ( not defined( eval $PFTOOLS::Net::PFTOOLS_VARS->{$2} ) ) {
+ if ( not defined $PFTOOLS_VARS->{$2} ) {
unshift @cond, 0;
}
else {
@@ -396,7 +396,7 @@
next;
}
elsif ( $1 eq "if" ) {
- if ( defined $PFTOOLS::Net::PFTOOLS_VARS->{$2} && eval $PFTOOLS::Net::PFTOOLS_VARS->{$2} ) {
+ if ( defined $PFTOOLS_VARS->{$2} && $PFTOOLS_VARS->{$2} ) {
unshift @cond, ( $#cond > 0 && !$cond[1] ) ? 0 : 1;
}
else {
@@ -405,7 +405,7 @@
next;
}
elsif ( $1 eq "ifnot" ) {
- if ( defined $PFTOOLS::Net::PFTOOLS_VARS->{$2} && !eval $PFTOOLS::Net::PFTOOLS_VARS->{$2} ) {
+ if ( defined $PFTOOLS_VARS->{$2} && ! $PFTOOLS_VARS->{$2} ) {
unshift @cond, 0;
}
else {
@@ -478,11 +478,11 @@
. " deja defini" );
}
else {
- eval( $PFTools::Net::PFTOOLS_VARS->{$2} = 1 );
+ $PFTOOLS_VARS->{$2} = 1;
}
}
elsif ( $1 eq "undef" ) {
- if ( not defined( eval $$2 ) ) {
+ if ( not defined( $PFTOOLS_VARS->{$2} ) ) {
Warn( $ERR_OPEN,
$FIC_CONF[0] . ":"
. $line[0] . ": "
@@ -490,7 +490,7 @@
. " deja non defini" );
}
else {
- eval undef $PFTools::Net::PFTOOLS_VARS->{$2};
+ undef $PFTOOLS_VARS->{$2};
}
}
else {
Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=590&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Wed Mar 19 09:04:01 2008
@@ -60,11 +60,6 @@
my $UMLTRUNKINGWORKS = 0;
my $UMLTRUNKFACTORIZE = 1;
-# my $PFTOOLS_VARS->{'VMWARE'} = 0;
-# our $UML;
-# if ( !defined $UML ) {
-# $UML = 0;
-# }
my $NOETH3 = 0;
# Error code
More information about the pf-tools-commits
mailing list