From 3a500543eda93bfe54bb578976d20c86e2d55ac1 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 3 May 2007 11:08:44 +0000 Subject: protect a block with an if git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@268 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede --- bin/ldap2apache | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bin/ldap2apache b/bin/ldap2apache index 51f1207..ff15a5c 100755 --- a/bin/ldap2apache +++ b/bin/ldap2apache @@ -405,15 +405,17 @@ phpwrapperfiles.each_pair do |dirname, wrappers| phpwrapperfilesdirectories[dirname] = true end -Dir.entries( @phpwrapperfilesdir ).each do |e| - next if ((e =~ /^\./) != nil) - next if phpwrapperfilesdirectories.has_key?( e ) - Dir.entries( @phpwrapperfilesdir+'/'+e ).each do |e2| - next if ((e2 =~ /^\./) != nil) and File.directory?(@phpwrapperfilesdir+'/'+e+'/'+e2) - File.unlink( @phpwrapperfilesdir+'/'+e+'/'+e2 ) +if @phpwrapperfilesdir + Dir.entries( @phpwrapperfilesdir ).each do |e| + next if ((e =~ /^\./) != nil) + next if phpwrapperfilesdirectories.has_key?( e ) + Dir.entries( @phpwrapperfilesdir+'/'+e ).each do |e2| + next if ((e2 =~ /^\./) != nil) and File.directory?(@phpwrapperfilesdir+'/'+e+'/'+e2) + File.unlink( @phpwrapperfilesdir+'/'+e+'/'+e2 ) + end + Dir.rmdir( @phpwrapperfilesdir+'/'+e ) + need_reload = true end - Dir.rmdir( @phpwrapperfilesdir+'/'+e ) - need_reload = true end if need_restart -- cgit v1.2.3