fix modcollapse in some string planet path cases
svn: r10175
This commit is contained in:
parent
31bb298e67
commit
762e04ba60
|
@ -162,7 +162,10 @@
|
||||||
,@(if (null? (cdr pkg+vers))
|
,@(if (null? (cdr pkg+vers))
|
||||||
null
|
null
|
||||||
`(,(string->number (cadr pkg+vers))
|
`(,(string->number (cadr pkg+vers))
|
||||||
,(let ([vers (caddr pkg+vers)])
|
. ,(if (null? (cddr pkg+vers))
|
||||||
|
null
|
||||||
|
(list
|
||||||
|
(let ([vers (caddr pkg+vers)])
|
||||||
(cond
|
(cond
|
||||||
[(regexp-match? #rx"<=" vers)
|
[(regexp-match? #rx"<=" vers)
|
||||||
`(- ,(string->number (substring vers 2)))]
|
`(- ,(string->number (substring vers 2)))]
|
||||||
|
@ -174,9 +177,11 @@
|
||||||
=> (lambda (m)
|
=> (lambda (m)
|
||||||
`(,(string->number (cadr m))
|
`(,(string->number (cadr m))
|
||||||
,(string->number (caddr m))))]
|
,(string->number (caddr m))))]
|
||||||
|
[(string->number vers)
|
||||||
|
=> (lambda (n) n)]
|
||||||
[else (error 'collapse-module-path
|
[else (error 'collapse-module-path
|
||||||
"confused when normalizing planet path: ~e"
|
"confused when normalizing planet path: ~e"
|
||||||
s)])))))
|
s)])))))))
|
||||||
,@(if (null? path)
|
,@(if (null? path)
|
||||||
null
|
null
|
||||||
(reverse (cdr (reverse path)))))))]
|
(reverse (cdr (reverse path)))))))]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user