kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

gnu-maintenance: Fix URLs returned by 'latest-release' for deep trees.

Browse Source 
With this, (latest-release "gcc") returns an <upstream-source> with URL:

  ftp://ftp.gnu.org/gnu/gcc/gcc-5.3.0/gcc-5.3.0.tar.gz

Previous it would omit "gcc-5.3.0/" from the URL.

Fixes a regression introduced in 0a7c5a0.

* guix/gnu-maintenance.scm (latest-release)[file->url, file->source]:
Add 'directory' parameter.  Update users.
This commit is contained in:
Ludovic Courtès 2015-12-07 21:48:31 +01:00
parent 56b6befb50
commit b6124f00b8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/gnu-maintenance.scm
View File

@ -329,11 +329,11 @@ open (resp. close) FTP connections; this can be useful to reuse connections."
(let-values (((server directory) (ftp-server/directory project))) (let-values (((server directory) (ftp-server/directory project)))
(define conn (ftp-open server)) (define conn (ftp-open server))
(define (file->url file) (define (file->url directory file)
(string-append "ftp://" server directory "/" file)) (string-append "ftp://" server directory "/" file))
(define (file->source file) (define (file->source directory file)
(let ((url (file->url file))) (let ((url (file->url directory file)))
(upstream-source (upstream-source
(package project) (package project)
(version (tarball->version file)) (version (tarball->version file))
@ -362,7 +362,7 @@ open (resp. close) FTP connections; this can be useful to reuse connections."
(releases (filter-map (match-lambda (releases (filter-map (match-lambda
((file 'file . _) ((file 'file . _)
(and (release-file? project file) (and (release-file? project file)
(file->source file))) (file->source directory file)))
(_ #f)) (_ #f))
entries))) entries)))