Permalink
Browse files

if old "v6" folder cannot be deleted, update will WARN but will not fail

  • Loading branch information...
1 parent 7fec4cb commit abbd2c40baa2611a03fb173f45cd462e907865c5 gbateson committed Feb 1, 2006
Showing with 5 additions and 2 deletions.
  1. +5 −2 mod/hotpot/db/update_to_v2.php
@@ -208,8 +208,11 @@ function hotpot_update_to_v2_1() {
$ds = DIRECTORY_SEPARATOR;
$dir = "mod{$ds}hotpot{$ds}v6";
print "removing old templates ($dir) ... ";
- $ok = hotpot_rm("$CFG->dirroot{$ds}$dir", false);
- print $ok ? get_string('success') : 'failed';
+ if (hotpot_rm("$CFG->dirroot{$ds}$dir", false)) {
+ print get_string('success');
+ } else {
+ print "failed<br>Please remove '$CFG->dirroot{$ds}$dir' manually";
+ }
print "<br />\n";
}
return $ok;

0 comments on commit abbd2c4

Please sign in to comment.