From 8ef47a15affcc4863d72b6a68208ec75b9e5801c Mon Sep 17 00:00:00 2001 From: teastep Date: Wed, 13 Jun 2007 13:28:15 +0000 Subject: [PATCH] Remove eval stuff from compiler.pl git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6533 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-perl/compiler.pl | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/Shorewall-perl/compiler.pl b/Shorewall-perl/compiler.pl index a01aadfdd..6a37f17a9 100755 --- a/Shorewall-perl/compiler.pl +++ b/Shorewall-perl/compiler.pl @@ -25,6 +25,7 @@ # use strict; use lib '/usr/share/shorewall-perl'; +use Shorewall::Compiler; use Getopt::Long; sub usage() { @@ -53,20 +54,9 @@ my $result = GetOptions('export' => \$export, usage unless $result && @ARGV < 2; -eval { - use Shorewall::Compiler; +my $options = 0; - my $options = 0; +$options |= EXPORT if $export; +$options |= TIMESTAMP if $timestamp; - $options |= EXPORT if $export; - $options |= TIMESTAMP if $timestamp; - - compiler $ARGV[0], $shorewall_dir, $verbose, $options; -}; - -my $foo = EXPORT; - -if ( $@ ) { - print STDERR $@; - exit 1; -} +compiler $ARGV[0], $shorewall_dir, $verbose, $options;