diff options
| -rwxr-xr-x | drakclassic | 8 | ||||
| -rwxr-xr-x | draklive | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/drakclassic b/drakclassic index da1f875..e120402 100755 --- a/drakclassic +++ b/drakclassic @@ -51,7 +51,13 @@ $::force = 0; sub clean { my ($build) = @_; - rm_rf($_) foreach grep { -e $_ } $build->get_builddir, $build->get_system_root; + + if (-e ($build->get_system_root)) { + # There shouldn't be anything mounted in the chroot, but play it safe... + umount_all_in_chroot($build); + system('sudo rm -rf ' . $build->get_system_root); + } + system('rm -rf ' . $build->get_builddir) if -e ($build->get_builddir); } ############################################################################### @@ -50,9 +50,13 @@ $::verbose = 1; sub clean { my ($build) = @_; - # Make sure no filesystems are mounted in the chroot before cleaning. - umount_all_in_chroot($build); - rm_rf($_) foreach grep { -e $_ } $build->get_builddir, $build->get_system_root; + + if (-e ($build->get_system_root)) { + # Make sure there's nothing left mounted in the chroot. + umount_all_in_chroot($build); + system('sudo rm -rf ' . $build->get_system_root); + } + system('rm -rf ' . $build->get_builddir) if -e ($build->get_builddir); } sub prepare_root { |