[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.305,1.306

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv12610/bin

Modified Files:
	sandweb.cgi 
Log Message:
made it possible to remove module, even if module dir does not
exist


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.305
retrieving revision 1.306
diff -U2 -r1.305 -r1.306
--- sandweb.cgi	11 Jul 2002 08:17:55 -0000	1.305
+++ sandweb.cgi	13 Jul 2002 06:56:30 -0000	1.306
@@ -2360,6 +2360,8 @@
 		# 
 		if ($user->module_exists(repo => $repo_name, module => $module_name)) {
-			# DELETE MODULE DIRECTORY
+			# remove module from config
 			$user->delete_module(repo => $repo_name, module => $module_name);
+			# attempt to delete module
+			# first, create file object
 			my $file = SandWeb::File->new(
 				'log_obj' => $log,
@@ -2367,8 +2369,19 @@
 				'location' => "$users_dir/$username/$repo_name",
 			);
-			if ($file->delete_folder(recurse => 1)) {
-				my $return = write_config();
+			# is this file a directory?
+			if ($file->get_file_type() eq 'Directory') {
+				# if so, try to delete it
+				if ($file->delete_folder(recurse => 1)) {
+					# module directory removed
+					# all done, write config file
+					my $return = write_config();
+				} else {
+					# failed removing the module directory
+					set_message("failed removing '$module_name' from system : $!");
+				}
 			} else {
-				set_message("failed removing '$module_name' from system : $!");
+				# no module directory to remove
+				# all done, write config file
+				my $return = write_config();
 			}
 		} else {