diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-12-07 21:48:31 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-12-07 23:32:01 +0100 |
| commit | b6124f00b86cd2138ed8d50c5ac04aa4d1e7bc82 (patch) | |
| tree | 080b94186ce96906ae1064ea7c49ed5106345899 | |
| parent | 56b6befb5072977e1afa11c6d5940111d2d96682 (diff) | |
| download | patches-b6124f00b86cd2138ed8d50c5ac04aa4d1e7bc82.tar patches-b6124f00b86cd2138ed8d50c5ac04aa4d1e7bc82.tar.gz | |
gnu-maintenance: Fix URLs returned by 'latest-release' for deep trees.
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.
| -rw-r--r-- | guix/gnu-maintenance.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index e1455ccb98..cd45702628 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -329,11 +329,11 @@ open (resp. close) FTP connections; this can be useful to reuse connections." (let-values (((server directory) (ftp-server/directory project))) (define conn (ftp-open server)) - (define (file->url file) + (define (file->url directory file) (string-append "ftp://" server directory "/" file)) - (define (file->source file) - (let ((url (file->url file))) + (define (file->source directory file) + (let ((url (file->url directory file))) (upstream-source (package project) (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 ((file 'file . _) (and (release-file? project file) - (file->source file))) + (file->source directory file))) (_ #f)) entries))) |