diff mbox series

[bug#71653] import/github: Honor upstream-name property.

Message ID 9c451854e49750ed14b11b0cee3d4c2ccea51e3a.1718814397.git.dariqq@posteo.net
State New
Headers show
Series [bug#71653] import/github: Honor upstream-name property. | expand

Commit Message

Dariqq June 19, 2024, 4:26 p.m. UTC 
* guix/import/github.scm (import-release): Use 'upstream-name if available.

Change-Id: I9a4999a01156ce02584270837ceab70996b49106
---
 guix/import/github.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


base-commit: c551e406a75273583ae3fef92f32468f905cc07f

Comments

Zheng Junjie June 23, 2024, 6:21 a.m. UTC | #1 
Dariqq <dariqq@posteo.net> writes:

> * guix/import/github.scm (import-release): Use 'upstream-name if available.
>
> Change-Id: I9a4999a01156ce02584270837ceab70996b49106
> ---
>  guix/import/github.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/guix/import/github.scm b/guix/import/github.scm
> index c5556d78ee..164fcde458 100644
> --- a/guix/import/github.scm
> +++ b/guix/import/github.scm
> @@ -328,8 +328,9 @@ (define* (import-release pkg #:key (version #f))
>    (let* ((original-uri (origin-uri (package-source pkg)))
>           (source-uri (github-uri original-uri))
>           (name (package-name pkg))
                  ^------------ I think maybe just use "package-upstream-name" on this?

> +         (upstream-name (assoc-ref (package-properties pkg) 'upstream-name))
>           (newest-version version-tag
> -                         (latest-released-version source-uri name
> +                         (latest-released-version source-uri (or upstream-name name)
>                                                    #:version version)))
>      (if newest-version
>          (upstream-source
>
> base-commit: c551e406a75273583ae3fef92f32468f905cc07f
Dariqq June 23, 2024, 8:05 a.m. UTC | #2 
On 23.06.24 08:21, Zheng Junjie wrote:
> Dariqq <dariqq@posteo.net> writes:
> 
>> * guix/import/github.scm (import-release): Use 'upstream-name if available.
>>
>> Change-Id: I9a4999a01156ce02584270837ceab70996b49106
>> ---
>>   guix/import/github.scm | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/guix/import/github.scm b/guix/import/github.scm
>> index c5556d78ee..164fcde458 100644
>> --- a/guix/import/github.scm
>> +++ b/guix/import/github.scm
>> @@ -328,8 +328,9 @@ (define* (import-release pkg #:key (version #f))
>>     (let* ((original-uri (origin-uri (package-source pkg)))
>>            (source-uri (github-uri original-uri))
>>            (name (package-name pkg))
>                    ^------------ I think maybe just use "package-upstream-name" on this?
> 
Thanks, i think this is better. Have sent a v2 now. THis will also 
change the package field of the resulting upstream-source to the 
upstream name, but this matches what other updaters do (i have checked 
with gnu-maintenance)

>> +         (upstream-name (assoc-ref (package-properties pkg) 'upstream-name))
>>            (newest-version version-tag
>> -                         (latest-released-version source-uri name
>> +                         (latest-released-version source-uri (or upstream-name name)
>>                                                     #:version version)))
>>       (if newest-version
>>           (upstream-source
>>
>> base-commit: c551e406a75273583ae3fef92f32468f905cc07f
diff mbox series

Patch

diff --git a/guix/import/github.scm b/guix/import/github.scm
index c5556d78ee..164fcde458 100644
--- a/guix/import/github.scm
+++ b/guix/import/github.scm
@@ -328,8 +328,9 @@  (define* (import-release pkg #:key (version #f))
   (let* ((original-uri (origin-uri (package-source pkg)))
          (source-uri (github-uri original-uri))
          (name (package-name pkg))
+         (upstream-name (assoc-ref (package-properties pkg) 'upstream-name))
          (newest-version version-tag
-                         (latest-released-version source-uri name
+                         (latest-released-version source-uri (or upstream-name name)
                                                   #:version version)))
     (if newest-version
         (upstream-source