comparison scripts/pkg/pkg.m @ 11191:01ddaedd6ad5

Reverse changeset b1f4bdc276b6. Use all lower case for "uniformoutput" option.
author Rik <octave@nomad.inbox5.com>
date Thu, 04 Nov 2010 12:18:08 -0700
parents b1f4bdc276b6
children 4ecc7bc5bc83
comparison
equal deleted inserted replaced
11190:b1f4bdc276b6 11191:01ddaedd6ad5
340 340
341 local_files = {}; 341 local_files = {};
342 unwind_protect 342 unwind_protect
343 343
344 if (octave_forge) 344 if (octave_forge)
345 [urls, local_files] = cellfun (@get_forge_download, files, "UniformOutput", false); 345 [urls, local_files] = cellfun (@get_forge_download, files, "uniformoutput", false);
346 [files, succ] = cellfun (@urlwrite, urls, local_files, "UniformOutput", false); 346 [files, succ] = cellfun (@urlwrite, urls, local_files, "uniformoutput", false);
347 succ = [succ{:}]; 347 succ = [succ{:}];
348 if (! all (succ)) 348 if (! all (succ))
349 i = find (! succ, 1); 349 i = find (! succ, 1);
350 error ("could not download file %s from url %s", local_files{i}, urls{i}); 350 error ("could not download file %s from url %s", local_files{i}, urls{i});
351 endif 351 endif
501 else 501 else
502 old_descriptions = installed_packages (list, list); 502 old_descriptions = installed_packages (list, list);
503 wd = pwd (); 503 wd = pwd ();
504 unwind_protect 504 unwind_protect
505 cd (prefix); 505 cd (prefix);
506 dirlist = glob (cellfun(@(x) cstrcat(x, '-*'), files, 'UniformOutput', 0)); 506 dirlist = glob (cellfun(@(x) cstrcat(x, '-*'), files, 'uniformoutput', 0));
507 unwind_protect_cleanup 507 unwind_protect_cleanup
508 cd (wd); 508 cd (wd);
509 end_unwind_protect 509 end_unwind_protect
510 endif 510 endif
511 descriptions = {}; 511 descriptions = {};
1357 oct = dir (fullfile (src, "*.oct")); 1357 oct = dir (fullfile (src, "*.oct"));
1358 mex = dir (fullfile (src, "*.mex")); 1358 mex = dir (fullfile (src, "*.mex"));
1359 1359
1360 filenames = cellfun (@(x) fullfile (src, x), 1360 filenames = cellfun (@(x) fullfile (src, x),
1361 {m.name, oct.name, mex.name}, 1361 {m.name, oct.name, mex.name},
1362 "UniformOutput", false); 1362 "uniformoutput", false);
1363 endif 1363 endif
1364 1364
1365 ## Split into architecture dependent and independent files. 1365 ## Split into architecture dependent and independent files.
1366 if (isempty (filenames)) 1366 if (isempty (filenames))
1367 idx = []; 1367 idx = [];