Mercurial > octave-nkf

diff scripts/pkg/private/uninstall.m @ 14471:d2c095e45196

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Remove redundant private function from the package manager. * pkg/private/rm_rf.m: remove file. * pkg/provate/build.m: remove calls to rm_rf. * pkg/provate/configure_make.m: remove calls to rm_rf. * pkg/provate/copy_files.m: remove calls to rm_rf. * pkg/provate/finish_installation.m: remove calls to rm_rf. * pkg/provate/install.m: remove calls to rm_rf. * pkg/provate/packinfo_copy_file.m: remove calls to rm_rf. * pkg/provate/prepare_installation.m: remove calls to rm_rf. * pkg/provate/repackage.m: remove calls to rm_rf. * pkg/provate/uninstall.m: remove calls to rm_rf.
author Carlo de Falco <kingcrimson@tiscali.it>
date Fri, 16 Mar 2012 18:55:09 +0100
parents cfb0173fe1ca
children a46b8b0bd325
line wrap: on
line diff
--- a/scripts/pkg/private/uninstall.m	Fri Mar 16 18:54:34 2012 +0100
+++ b/scripts/pkg/private/uninstall.m	Fri Mar 16 18:55:09 2012 +0100
@@ -112,16 +112,16 @@
       endif
     endif
     if (exist (desc.dir, "dir"))
-      [status, msg] = rm_rf (desc.dir);
-      if (status != 1)
+      [status, msg] = rmdir (desc.dir, "s");
+      if (status != 1 && exist (desc.dir, "dir"))
         error ("couldn't delete directory %s: %s", desc.dir, msg);
       endif
-      [status, msg] = rm_rf (getarchdir (desc));
-      if (status != 1)
+      [status, msg] = rmdir (getarchdir (desc), "s");
+      if (status != 1 && exist (getarchdir (desc), "dir"))
         error ("couldn't delete directory %s: %s", getarchdir (desc), msg);
       endif
       if (dirempty (desc.archprefix))
-        rm_rf (desc.archprefix);
+        rmdir (desc.archprefix, "s");
       endif
     else
       warning ("directory %s previously lost", desc.dir);