On Fri, Dec 21, 2018 at 09:50:51PM +0100, Ludovic Courtès wrote:
> Hi!
>
> Efraim Flashner <address@hidden> skribis:
>
> > Here's what I currently have. I don't think I've tried running the tests
> > I've written yet, and Ludo said there was a better way to check if the
> > download was a git-fetch or a url-fetch. As the logic is currently
> > written it'll flag any package hosted on github owned by 'archive' or
> > any package named 'archive' in addition to the ones we want.
>
> OK. I think you’re pretty much there anyway, so please don’t drop the
> ball. ;-)
>
> Some comments follow:
>
> > From 8a07c8aea1f23db48a9e69956ad15f79f0f70e35 Mon Sep 17 00:00:00 2001
> > From: Efraim Flashner <address@hidden>
> > Date: Tue, 23 Oct 2018 12:01:53 +0300
> > Subject: [PATCH] lint: Add checker for unstable tarballs.
> >
> > * guix/scripts/lint.scm (check-source-unstable-tarball): New procedure.
> > (%checkers): Add it.
> > * tests/lint.scm ("source-unstable-tarball", source-unstable-tarball:
> > source #f", "source-unstable-tarball: valid", source-unstable-tarball:
> > not-github", source-unstable-tarball: git-fetch"): New tests.
>
> [...]
>
> > +(define (check-source-unstable-tarball package)
> > + "Emit a warning if PACKAGE's source is an autogenerated tarball."
> > + (define (github-tarball? origin)
> > + (string-contains origin "github.com"))
> > + (define (autogenerated-tarball? origin)
> > + (string-contains origin "/archive/"))
> > + (let ((origin (package-source package)))
> > + (unless (not origin) ; check for '(source #f)'
> > + (let ((uri (origin-uri origin))
> > + (dl-method (origin-method origin)))
> > + (unless (not (pk dl-method "url-fetch"))
> > + (when (and (github-tarball? uri)
> > + (autogenerated-tarball? uri))
> > + (emit-warning package
> > + (G_ "the source URI should not be an autogenerated
> > tarball")
> > + 'source)))))))
>
> You should use ‘origin-uris’ (plural), which always returns a list of
> URIs, and iterate on them (see ‘check-mirror-url’ as an example.)
That works really well
>
> Also, when you have a URI, you can obtain just the host part and decode
> the path part like this:
>
> --8<---------------cut here---------------start------------->8---
> scheme@(guile-user)> (string->uri
> "https://github.com/foo/bar/archive/whatnot";)
> $2 = #<<uri> scheme: https userinfo: #f host: "github.com" port: #f path:
> "/foo/bar/archive/whatnot" query: #f fragment: #f>
> scheme@(guile-user)> (uri-host $2)
> $3 = "github.com"
> scheme@(guile-user)> (split-and-decode-uri-path (uri-path $2))
> $4 = ("foo" "bar" "archive" "whatnot")
> --8<---------------cut here---------------end--------------->8---
>
> That way you should be able to get more accurate matching than with
> ‘string-contains’. Does that make sense?
'third' from srfi-1 also helped a lot, considering how the github uris
are formatted.
>
> The tests look good… but could you make sure they pass? :-)
pfft, little things :) (forgot to export check-source-unstable-tarball)
>
> Thank you!
>
> Ludo’.
Next version attached
--
Efraim Flashner <address@hidden> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
0001-lint-Add-checker-for-unstable-tarballs.patch
Description: Text document
signature.asc
Description: PGP signature
--- End Message ---