[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/09: gnu-maintenance: Honor 'upstream-name' property in GNU updater.
From: |
Ludovic Courtès |
Subject: |
01/09: gnu-maintenance: Honor 'upstream-name' property in GNU updater. |
Date: |
Fri, 27 Jan 2017 23:38:49 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit b03218d5326ba6fbb59d9425fb06a8aee9ed73a4
Author: Ludovic Courtès <address@hidden>
Date: Fri Jan 27 23:20:59 2017 +0100
gnu-maintenance: Honor 'upstream-name' property in GNU updater.
* guix/gnu-maintenance.scm (gnu-package?): Honor the 'usptream-name'
property of PACKAGE.
(ftp-server/directory): Likewise.
---
guix/gnu-maintenance.scm | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 789724c..499967e 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -195,7 +195,9 @@ network to check in GNU's database."
(or (gnu-home-page? package)
(let ((url (and=> (package-source package) origin-uri))
- (name (package-name package)))
+ (name (or (assq-ref (package-properties package)
+ 'upstream-name)
+ (package-name package))))
(case (and (string? url) (mirror-type url))
((gnu) #t)
((non-gnu) #f)
@@ -210,10 +212,12 @@ network to check in GNU's database."
(define (ftp-server/directory package)
"Return the FTP server and directory where PACKAGE's tarball are stored."
- (values (or (assoc-ref (package-properties package) 'ftp-server)
- "ftp.gnu.org")
- (or (assoc-ref (package-properties package) 'ftp-directory)
- (string-append "/gnu/" (package-name package)))))
+ (let ((name (or (assq-ref (package-properties package) 'upstream-name)
+ (package-name package))))
+ (values (or (assoc-ref (package-properties package) 'ftp-server)
+ "ftp.gnu.org")
+ (or (assoc-ref (package-properties package) 'ftp-directory)
+ (string-append "/gnu/" name)))))
(define (sans-extension tarball)
"Return TARBALL without its .tar.* or .zip extension."
- branch master updated (d61b248 -> b45dbfc), Ludovic Courtès, 2017/01/27
- 03/09: gnu: emacs-emms: Add 'upstream-name' property., Ludovic Courtès, 2017/01/27
- 08/09: doc: Add missing Upstart command for the binary installation., Ludovic Courtès, 2017/01/27
- 07/09: doc: Add 'cups-configuration' example with 'hplip'., Ludovic Courtès, 2017/01/27
- 09/09: tests: Adjust pypi test to recent importer change., Ludovic Courtès, 2017/01/27
- 05/09: import: github: Better tolerate unexpected file extensions., Ludovic Courtès, 2017/01/27
- 01/09: gnu-maintenance: Honor 'upstream-name' property in GNU updater.,
Ludovic Courtès <=
- 02/09: gnu-maintenance: GNU updater handles gnu.org-hosted Emacs packages., Ludovic Courtès, 2017/01/27
- 04/09: gnu-maintenance: 'gnu-package?' ignores invalid URLs., Ludovic Courtès, 2017/01/27
- 06/09: packages: Add 'package-upstream-name' and use it., Ludovic Courtès, 2017/01/27