Merge branch 'migrate_to_catalyst' of ssh://git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst

1 files changed, 4 insertions, 4 deletions

diff --git a/setenv.pl b/setenv.pl
index 1d4ca3d2b..b5461f30e 100755
--- a/setenv.pl
+++ b/setenv.pl
@@ -34,12 +34,12 @@ $ENV{PATH} = join ':', uniq "$root/bin", split( m/:/, $ENV{PATH} );
 
 # now decide what to do  - if no arguments print out shell arguments to set the
 # environment. If there are arguments then run those so that they run correctly
-if (@ARGV) {
-    system @ARGV;
-}
+#if (@ARGV) {
+#    system @ARGV;
+#}
 
 # we might want to require this file to configure something like a CGI script
-elsif ( $0 eq __FILE__ ) {
+if ( $0 eq __FILE__ ) {
 
     my @keys = sort 'PATH', grep { m{^PERL} } keys %ENV;