Mercurial > octave-nkf
changeset 18214:442bca7dea44 stable
Fix installing packages where dependency name contains '-' (bug #41087).
* scripts/pkg/private/fix_depends.m: Add '-' to list of allowed
characters in a name.
| author | Olaf Till <i7tiol@t-online.de> |
|---|---|
| date | Fri, 03 Jan 2014 15:34:33 +0100 |
| parents | 8d7e45ea11fa |
| children | a8408a424a37 |
| files | scripts/pkg/private/fix_depends.m |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/pkg/private/fix_depends.m Fri Jan 03 19:30:12 2014 -0800 +++ b/scripts/pkg/private/fix_depends.m Fri Jan 03 15:34:33 2014 +0100 @@ -29,7 +29,7 @@ deps = strtrim (ostrsplit (tolower (depends), ",")); deps_cell = cell (1, length (deps)); dep_pat = ... - '\s*(?<name>\w+)+\s*(\(\s*(?<op>[<>=]+)\s*(?<ver>\d+\.\d+(\.\d+)*)\s*\))*\s*'; + '\s*(?<name>[-\w]+)\s*(\(\s*(?<op>[<>=]+)\s*(?<ver>\d+\.\d+(\.\d+)*)\s*\))*\s*'; ## For each dependency. for i = 1:length (deps)