aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-05-04 09:09:03 +0200
committerLudovic Courtès <ludo@gnu.org>2023-05-06 17:12:45 +0200
commit71fd35c1d55988c413a37c7d15006b4d38d7dde7 (patch)
tree5f26d2b6ac0f3adfc685cc6505730f1f8783d260
parent5c5bdab9295f275b6b717259d7a413b216867763 (diff)
downloadguix-71fd35c1d55988c413a37c7d15006b4d38d7dde7.tar.gz
guix-71fd35c1d55988c413a37c7d15006b4d38d7dde7.zip
lint: archival: Warn against non-origin package sources.
Suggested by Maxim Cournoyer <maxim.cournoyer@gmail.com> and Simon Tournier <zimon.toutoune@gmail.com>. * guix/lint.scm (check-archival): Add 'local-file?' clause. Clarify message in case (package-source package) is not an origin. * tests/lint.scm ("archival: not an origin"): New test.
-rw-r--r--guix/lint.scm11
-rw-r--r--tests/lint.scm11
2 files changed, 16 insertions, 6 deletions
diff --git a/guix/lint.scm b/guix/lint.scm
index 0ed5b8dc98..72b3f4e7b1 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -1610,11 +1610,11 @@ try again later")
(parameterize ((%allow-request? skip-when-limit-reached))
(catch #t
(lambda ()
- (match (and (origin? (package-source package))
- (package-source package))
+ (match (package-source package)
(#f ;no source
'())
- ((= origin-uri (? git-reference? reference))
+ ((and (? origin?)
+ (= origin-uri (? git-reference? reference)))
(define url
(git-reference-url reference))
(define commit
@@ -1680,9 +1680,12 @@ Disarchive entry refers to non-existent SWH directory '~a'")
((? content?)
'())))
'()))
+ ((? local-file?)
+ '())
(_
(list (make-warning package
- (G_ "unsupported source type")
+ (G_ "\
+source is not an origin, it cannot be archived")
#:field 'source)))))
(match-lambda*
(('swh-error url method response)
diff --git a/tests/lint.scm b/tests/lint.scm
index ce22e2355a..b91bd053c5 100644
--- a/tests/lint.scm
+++ b/tests/lint.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Alex Kost <alezost@gmail.com>
@@ -43,7 +43,8 @@
#:use-module (guix lint)
#:use-module (guix ui)
#:use-module (guix swh)
- #:use-module ((guix gexp) #:select (gexp local-file gexp?))
+ #:use-module ((guix gexp)
+ #:select (gexp local-file computed-file gexp?))
#:use-module ((guix utils) #:select (call-with-temporary-directory))
#:use-module ((guix import hackage) #:select (%hackage-url))
#:use-module ((guix import stackage) #:select (%stackage-url))
@@ -1298,6 +1299,12 @@
'()
(check-formatting (dummy-package "x")))
+(test-assert "archival: not an origin"
+ (warning-contains? "not an origin"
+ (check-archival
+ (dummy-package
+ "x" (source (computed-file "x-src" #t))))))
+
(test-assert "archival: missing content"
(let* ((origin (origin
(method url-fetch)