Mercurial > hg > octave-lyh
changeset 6245:e154732e00b7
[project @ 2007-01-19 03:11:24 by jwe]
author | jwe |
---|---|
date | Fri, 19 Jan 2007 03:11:24 +0000 |
parents | 8cab253171b6 |
children | b317fc1b21cc |
files | scripts/ChangeLog scripts/pkg/pkg.m src/ChangeLog |
diffstat | 3 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2007-01-18 Søren Hauberg <hauberg@gmail.com> + + * pkg/pkg.m (create_pkgadddel): Call fullfile with nm, not "nm". + 2007-01-10 Baylis Shanks <bshanks3@hotmail.com> * set/ismember.m: Handle N-d arrays.
--- a/scripts/pkg/pkg.m +++ b/scripts/pkg/pkg.m @@ -360,7 +360,7 @@ try for i = packages_to_uninstall uninstall({installed_packages{i}.name}, false, local_list, - global_list); + global_list); endfor catch ## Something went wrong, delete tmpdirs @@ -375,9 +375,9 @@ for i = 1:length(descriptions) desc = descriptions{i}; pdir = packdirs{i}; - copy_files(desc, pdir); - create_pkgadddel(desc, pdir, "PKG_ADD"); - create_pkgadddel(desc, pdir, "PKG_DEL"); + copy_files(desc, pdir); + create_pkgadddel(desc, pdir, "PKG_ADD"); + create_pkgadddel(desc, pdir, "PKG_DEL"); finish_installation (desc, pdir) endfor catch @@ -395,8 +395,8 @@ ## from the list for i = length(descriptions):-1:1 if (dirempty(descriptions{i}.dir,{"packinfo","doc"})) - rm_rf(descriptions{i}.dir); - descriptions(i) = []; + rm_rf(descriptions{i}.dir); + descriptions(i) = []; endif endfor @@ -699,7 +699,7 @@ endfor ## Add developer included PKG commands - packdirnm = fullfile(packdir, "nm"); + packdirnm = fullfile(packdir, nm); if (exist(packdirnm, "file")) fid2 = fopen(packdirnm,"rt"); if (fid2 >= 0)
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -11032,7 +11032,7 @@ add_hdf5_data): Use 0, not NULL in calls to HDF routines. * oct-procbuf.cc (octave_procbuf::open): Use NULL, not 0 as last - arg in call to execl.xo + arg in call to execl. * debug.cc (get_user_function): Initialise dbg_fcn to 0, not NULL.