# HG changeset patch # User Mike Miller # Date 1337170352 14400 # Node ID e12a0ac530b4bafde2061987fe66f030b3a3eb20 # Parent e3d03b48ecb59dc36a0bd38db6ae2cd7c7c54def Fix handling of duplicate packages * scripts/pkg/private/installed_packages.m, scripts/pkg/private/rebuild.m: Fix comparison against list of duplicate packages. diff -r e3d03b48ecb5 -r e12a0ac530b4 scripts/pkg/private/installed_packages.m --- a/scripts/pkg/private/installed_packages.m Tue May 15 15:18:52 2012 -0400 +++ b/scripts/pkg/private/installed_packages.m Wed May 16 08:12:32 2012 -0400 @@ -40,11 +40,11 @@ ## Locally installed packages take precedence. dup = []; for i = 1:length (installed_pkgs_lst) - if (find (dup, i)) + if (any (dup == i)) continue; endif for j = (i+1):length (installed_pkgs_lst) - if (find (dup, j)) + if (any (dup == j)) continue; endif if (strcmp (installed_pkgs_lst{i}.name, installed_pkgs_lst{j}.name)) diff -r e3d03b48ecb5 -r e12a0ac530b4 scripts/pkg/private/rebuild.m --- a/scripts/pkg/private/rebuild.m Tue May 15 15:18:52 2012 -0400 +++ b/scripts/pkg/private/rebuild.m Wed May 16 08:12:32 2012 -0400 @@ -81,11 +81,11 @@ dup = []; for i = 1:length (descriptions) - if (find (dup, i)) + if (any (dup == i)) continue; endif for j = (i+1):length (descriptions) - if (find (dup, j)) + if (any (dup == j)) continue; endif if (strcmp (descriptions{i}.name, descriptions{j}.name))