Mercurial > octave
changeset 26589:5bfbcbec6826
pkg.m: Clearer error messages when file doesn't exist or -forge switch is forgotten (bug #55515).
| author | Andrew Janke <andrew@apjanke.net> |
|---|---|
| date | Fri, 18 Jan 2019 18:25:31 -0500 |
| parents | 5fec5393a9c8 |
| children | 26a3861a34b6 |
| files | scripts/pkg/pkg.m |
| diffstat | 1 files changed, 44 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/pkg/pkg.m Mon Jan 21 18:19:59 2019 -0800 +++ b/scripts/pkg/pkg.m Fri Jan 18 18:25:31 2019 -0500 @@ -416,21 +416,55 @@ else ## If files do not exist, maybe they are not local files. ## Try to download them. - external_files_mask = cellfun (@(x) isempty (glob (x)), files); - if (any (external_files_mask)) + not_local_files = cellfun (@(x) isempty (glob (x)), files); + if (any (not_local_files)) [success, msg] = mkdir (tmp_dir); if (success != 1) error ("pkg: failed to create temporary directory: %s", msg); endif - for file_idx = find (external_files_mask) - - [~, fname, fext] = fileparts (files{file_idx}); - local_files{end+1} = fullfile (tmp_dir, [fname fext]); - [~, success, msg] = urlwrite (files{file_idx}, local_files{end}); - if (success != 1) - error ("pkg: failed to read package '%s': %s", - files{file_idx}, msg); + for file = files(not_local_files) + file = file{1}; + [~, fname, fext] = fileparts (file); + tmp_file = fullfile (tmp_dir, [fname fext]); + local_files{end+1} = tmp_file; + looks_like_url = regexp (file, '^\w+://'); + if (looks_like_url) + [~, success, msg] = urlwrite (file, local_files{end}); + if (success != 1) + error ("pkg: failed downloading '%s': %s", file, msg); + endif + ## Verify that download is a tarball, + ## to protect against ISP DNS hijacking. + ## FIXME: Need a test which does not rely on external OS. + #{ + if (isunix ()) + [ok, file_descr] = ... + system (sprintf ('file "%s" | cut -d ":" -f 2', ... + local_files{end})); + if (! ok) + if (strfind (file_descr, "HTML")) + error (["pkg: Invalid package file downloaded from " ... + "%s\n" ... + "File is HTML, not a tar archive."], ... + file); + endif + else + ## Ignore: maybe something went wrong with the "file" call. + endif + endif + #} + else + looks_like_pkg_name = regexp (file, '^[\w-]+$'); + if (looks_like_pkg_name) + error (["pkg: file not found: %s.\n" ... + "This looks like an Octave Forge package name." ... + " Did you mean:\n" ... + " pkg install -forge %s"], ... + file, file); + else + error ("pkg: file not found: %s", file); + endif endif files{file_idx} = local_files{end};