Mercurial > octave-nkf
changeset 6687:44ebfc8c4ff0
[project @ 2007-06-03 22:17:01 by dbateman]
| author | dbateman |
|---|---|
| date | Sun, 03 Jun 2007 22:17:01 +0000 |
| parents | 2aad75fcc93a |
| children | b26a8e0e42cd |
| files | scripts/ChangeLog scripts/pkg/pkg.m |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Sun Jun 03 20:58:29 2007 +0000 +++ b/scripts/ChangeLog Sun Jun 03 22:17:01 2007 +0000 @@ -1,7 +1,8 @@ 2007-06-03 David Bateman <dbateman@free.fr> * polynomial/spline.m: Add a small tolerance to spline tests. - + * pkg/pkg.m: Protect against multiple actions being define. + 2007-06-01 David Bateman <dbateman@free.fr> * pkg.m (pkg:is_superuser): Remove function used in one place and
--- a/scripts/pkg/pkg.m Sun Jun 03 20:58:29 2007 +0000 +++ b/scripts/pkg/pkg.m Sun Jun 03 22:17:01 2007 +0000 @@ -224,7 +224,11 @@ endif case {"list", "install", "uninstall", "load", "unload", ... "prefix", "local_list", "global_list", "rebuild", "build"} - action = varargin{i}; + if (strcmp (action,"none")) + action = varargin{i}; + else + error ("more than one action specified"); + endif otherwise files{end+1} = varargin{i}; endswitch @@ -877,7 +881,6 @@ endif tfile = strcat (pack.name, "-", pack.version, ".tar"); tar (tfile, pack.name); - unwind_protect_cleanup if (exist (pack.name, "dir"))