GNU bug report logs - #71653
[PATCH] import/github: Honor upstream-name property.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71653 in the body.
You can then email your comments to 71653 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Dariqq <dariqq <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Dariqq <dariqq <at> posteo.net>
Subject: [PATCH] import/github: Honor upstream-name property.
Date: Wed, 19 Jun 2024 16:26:37 +0000

* 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))
+         (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
-- 
2.45.1

Message #8 received at 71653 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: Dariqq <dariqq <at> posteo.net>
Cc: 71653 <at> debbugs.gnu.org
Subject: Re: [bug#71653] [PATCH] import/github: Honor upstream-name property.
Date: Sun, 23 Jun 2024 14:21:49 +0800

[Message part 1 (text/plain, inline)]

Dariqq <dariqq <at> 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

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 71653 <at> debbugs.gnu.org (full text, mbox):

From: Dariqq <dariqq <at> posteo.net>
To: 71653 <at> debbugs.gnu.org
Cc: Dariqq <dariqq <at> posteo.net>
Subject: [PATCH v2] import/github: Honor upstream-name property.
Date: Sun, 23 Jun 2024 08:03:26 +0000

* guix/import/github.scm (import-release): Use package-upstream-name instead
of package-name.

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

diff --git a/guix/import/github.scm b/guix/import/github.scm
index c5556d78ee..7be29ca151 100644
--- a/guix/import/github.scm
+++ b/guix/import/github.scm
@@ -327,7 +327,7 @@ (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))
+         (name (package-upstream-name pkg))
          (newest-version version-tag
                          (latest-released-version source-uri name
                                                   #:version version)))

base-commit: dd5ef2cbddd76cf048a9b514cdcea6d22411a2cb
-- 
2.45.1

Message #14 received at 71653 <at> debbugs.gnu.org (full text, mbox):

From: Dariqq <dariqq <at> posteo.net>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 71653 <at> debbugs.gnu.org
Subject: Re: [bug#71653] [PATCH] import/github: Honor upstream-name property.
Date: Sun, 23 Jun 2024 08:05:01 +0000

On 23.06.24 08:21, Zheng Junjie wrote:
> Dariqq <dariqq <at> 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

Message #19 received at 71653-done <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: 71653-done <at> debbugs.gnu.org
Cc: Dariqq <dariqq <at> posteo.net>, Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Subject: Re: [PATCH] import/github: Honor upstream-name property.
Date: Sat, 06 Jul 2024 12:08:29 +0200

Hello,

> On 23.06.24 08:21, Zheng Junjie wrote:
> > Dariqq <dariqq <at> posteo.net> writes:
> > 
> >> * guix/import/github.scm (import-release): Use 'upstream-name if
> >available.

Applied. Thank you!

Regards,
-- 
Nicolas Goaziou

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.