diff mbox series

[bug#49112] import: launchpad: Use repository to retrieve releases.

Message ID 20210619100739.11713-1-kraai@ftbfs.org
State Accepted
Headers show
Series [bug#49112] import: launchpad: Use repository to retrieve releases. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Matthew James Kraai June 19, 2021, 10:07 a.m. UTC 
* guix/import/launchpad.scm (latest-released-version): Use repository instead
of package name.
(latest-release): Pass repository to latest-released-version.
---
 guix/import/launchpad.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Brice Waegeneire June 19, 2021, 8:38 p.m. UTC | #1 
Hello Matthew,

Thank you for the patch!

Matthew James Kraai <kraai@ftbfs.org> writes:

> * guix/import/launchpad.scm (latest-released-version): Use repository instead
> of package name.
> (latest-release): Pass repository to latest-released-version.

I had a patch for this, but yours is cleaner, using
'launchpad-directory'.  I have added a copyright line and pushed as 9171079e515289120405c70c143445df2a35db1c.

Cheers,
- Brice
diff mbox series

Patch

diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm
index a52b39a085..23ac6a3c7b 100644
--- a/guix/import/launchpad.scm
+++ b/guix/import/launchpad.scm
@@ -100,8 +100,8 @@  URL of the form
   (match (string-split (uri-path (string->uri url)) #\/)
     ((_ repo . rest) repo)))
 
-(define (latest-released-version package-name)
-  "Return a string of the newest released version name given the PACKAGE-NAME,
+(define (latest-released-version repository)
+  "Return a string of the newest released version name given the REPOSITORY,
 for example, 'linuxdcpp'. Return #f if there is no releases."
   (define (pre-release? x)
     ;; Versions containing anything other than digit characters and "." (for
@@ -112,7 +112,7 @@  for example, 'linuxdcpp'. Return #f if there is no releases."
 
   (match (json-fetch
           (string-append "https://api.launchpad.net/1.0/"
-                         package-name "/releases"))
+                         repository "/releases"))
     (#f #f)                                       ;404 or similar
     (json
      (assoc-ref
@@ -129,7 +129,8 @@  for example, 'linuxdcpp'. Return #f if there is no releases."
 
   (let* ((source-uri (origin-github-uri (package-source pkg)))
          (name (package-name pkg))
-         (newest-version (latest-released-version name)))
+         (repository (launchpad-repository source-uri))
+         (newest-version (latest-released-version repository)))
     (if newest-version
         (upstream-source
          (package name)