Mercurial > octave-nkf
changeset 10199:956eab916c86
again complement->setdiff
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Tue, 26 Jan 2010 08:11:53 +0100 |
| parents | 025564630c8d |
| children | 7c1b1c084af1 |
| files | scripts/ChangeLog scripts/pkg/pkg.m |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Tue Jan 26 01:49:39 2010 -0500 +++ b/scripts/ChangeLog Tue Jan 26 08:11:53 2010 +0100 @@ -1,3 +1,7 @@ +2010-01-26 Jaroslav Hajek <highegg@gmail.com> + + * pkg/pkg.m: More complement -> setdiff changes. + 2010-01-23 Jaroslav Hajek <highegg@gmail.com> * pkg/pkg.m: Use setdiff rather than complement.
--- a/scripts/pkg/pkg.m Tue Jan 26 01:49:39 2010 -0500 +++ b/scripts/pkg/pkg.m Tue Jan 26 08:11:53 2010 +0100 @@ -668,13 +668,11 @@ if (global_install) ## Global installation is not allowed to have dependencies on locally ## installed packages. - idx1 = complement (packages_to_uninstall, - 1:length(global_packages)); + idx1 = setdiff (1:length(global_packages), packages_to_uninstall); pseudo_installed_packages = {global_packages{idx1}, ... descriptions{idx2}}; else - idx1 = complement (packages_to_uninstall, - 1:length(local_packages)); + idx1 = setdiff (1:length(local_packages), packages_to_uninstall); pseudo_installed_packages = {local_packages{idx1}, ... global_packages{:}, ... descriptions{idx2}};