Mercurial > hg > octave-nkf

changeset 6055:060985c633d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-17 12:45:08 by dbateman]
author dbateman
date Tue, 17 Oct 2006 12:45:08 +0000
parents 769b203ede37
children 1297bb9a3ad0
files scripts/ChangeLog scripts/pkg/pkg.m
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-17  David Bateman  <dbateman@free.fr>
+
+	* pkg/pkg.m (uninstall): Allow the uninstall to proceed even if
+	the package directory is missing.
+
 2006-10-13  John W. Eaton  <jwe@octave.org>
 
 	* plot/box.m: New function.
--- a/scripts/pkg/pkg.m
+++ b/scripts/pkg/pkg.m
@@ -462,10 +462,14 @@
         endif
         ## Do the actual deletion
         rmpath(desc.dir);
-        [status, msg] = rm_rf(desc.dir);
-        if (status != 1)
+	if (exist (desc.dir, "dir"))
+          [status, msg] = rm_rf(desc.dir);
+          if (status != 1)
             error("Couldn't delete directory %s: %s", desc.dir, msg);
-        endif
+          endif
+	else
+	  warning("Directory %s previously lost", desc.dir);
+	endif
     endfor
 
     ## Write a new ~/.octave_packages