Package: guix-patches;
Reported by: Tomas Volf <~@wolfsden.cz>
Date: Mon, 19 Feb 2024 16:18:01 UTC
Severity: normal
Tags: patch
Done: Z572 <zhengjunjie <at> iscas.ac.cn>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 69276 in the body.
You can then email your comments to 69276 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#69276; Package guix-patches.
(Mon, 19 Feb 2024 16:18:02 GMT) Full text and rfc822 format available.Tomas Volf <~@wolfsden.cz>:guix-patches <at> gnu.org.
(Mon, 19 Feb 2024 16:18:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: guix-patches <at> gnu.org Cc: Tomas Volf <~@wolfsden.cz> Subject: [PATCH] gnu: libtorrent-rasterbar: Update to 2.0.10. Date: Mon, 19 Feb 2024 17:16:33 +0100
* gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 2.0.10.
Change-Id: I9056b2cb6eac9740f95daf2fb73d874ca95f1a7f
---
gnu/packages/bittorrent.scm | 32 +++++---------------------------
1 file changed, 5 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 0d544235c1..34a7c17738 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -418,16 +418,10 @@ (define-public mktorrent
(license (list l:public-domain ; sha1.*, used to build without OpenSSL
l:gpl2+)))) ; with permission to link with OpenSSL
-(define %v2_empty_file.torrent
- (origin (method url-fetch)
- (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent")
- (sha256
- (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn"))))
-
(define-public libtorrent-rasterbar
(package
(name "libtorrent-rasterbar")
- (version "2.0.9")
+ (version "2.0.10")
(source
(origin
(method url-fetch)
@@ -436,14 +430,7 @@ (define-public libtorrent-rasterbar
"releases/download/v" version "/"
"libtorrent-rasterbar-" version ".tar.gz"))
(sha256
- (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch"))
- ;; https://github.com/arvidn/libtorrent/issues/7566
- ;; Remove when resolved. I would hope this to be fixed in 2.0.10.
- (modules '((guix build utils)))
- (snippet
- #~(substitute* "test/test_copy_file.cpp"
- (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all)
- (string-append all ", TMPFS_MAGIC\n"))))))
+ (base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-Dpython-bindings=ON"
@@ -452,14 +439,6 @@ (define-public libtorrent-rasterbar
#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
- ;; https://github.com/arvidn/libtorrent/issues/7567
- ;; Remove when resolved. I would hope this to be fixed in 2.0.10.
- ;; Do not forget to remove the %v2_empty_file.torrent variable.
- (add-before 'configure 'copy-v2_empty_file.torrent
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (copy-file (assoc-ref (or native-inputs inputs)
- "%v2_empty_file.torrent")
- "test/test_torrents/v2_empty_file.torrent")))
(replace 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(let* ((disabled-tests
@@ -500,10 +479,9 @@ (define-public libtorrent-rasterbar
;; "--output-on-failure")
)))))))
(inputs (list boost openssl))
- (native-inputs `(("libfaketime" ,libfaketime)
- ("python-wrapper" ,python-wrapper)
- ("pkg-config" ,pkg-config)
- ("%v2_empty_file.torrent" ,%v2_empty_file.torrent)))
+ (native-inputs (list libfaketime
+ python-wrapper
+ pkg-config))
(home-page "https://www.libtorrent.org/")
(synopsis "Feature-complete BitTorrent implementation")
(description
base-commit: fdbf4192f5eaa7fdb5e6e2e98ada0726c8104824
--
2.41.0
guix-patches <at> gnu.org:bug#69276; Package guix-patches.
(Tue, 06 Aug 2024 13:09:02 GMT) Full text and rfc822 format available.Message #8 received at 69276 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 69276 <at> debbugs.gnu.org Subject: [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10. Date: Tue, 6 Aug 2024 21:07:40 +0800
From 4af05095ca922bb6d0335a6e946a404d4764ac1f Mon Sep 17 00:00:00 2001
Message-ID: <4af05095ca922bb6d0335a6e946a404d4764ac1f.1722949379.git.adam.faiz <at> disroot.org>
In-Reply-To: <cover.1722949379.git.adam.faiz <at> disroot.org>
References: <cover.1722949379.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Tue, 6 Aug 2024 19:57:47 +0800
Subject: [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10.
* gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 2.0.10.
[source]<snippet>: Remove test/test_copy_file.cpp patch since it's resolved.
[native-inputs]: Remove no longer needed file (v2_empty_file.torrent).
[arguments]<#:phases>: And remove a phase copying it into the correct place.
---
gnu/packages/bittorrent.scm | 28 +++-------------------------
1 file changed, 3 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 5c2fa9c688..abc598f7fa 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -418,16 +418,10 @@ (define-public mktorrent
(license (list l:public-domain ; sha1.*, used to build without OpenSSL
l:gpl2+)))) ; with permission to link with OpenSSL
-(define %v2_empty_file.torrent
- (origin (method url-fetch)
- (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent")
- (sha256
- (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn"))))
-
(define-public libtorrent-rasterbar
(package
(name "libtorrent-rasterbar")
- (version "2.0.9")
+ (version "2.0.10")
(source
(origin
(method url-fetch)
@@ -436,14 +430,7 @@ (define-public libtorrent-rasterbar
"releases/download/v" version "/"
"libtorrent-rasterbar-" version ".tar.gz"))
(sha256
- (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch"))
- ;; https://github.com/arvidn/libtorrent/issues/7566
- ;; Remove when resolved. I would hope this to be fixed in 2.0.10.
- (modules '((guix build utils)))
- (snippet
- #~(substitute* "test/test_copy_file.cpp"
- (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all)
- (string-append all ", TMPFS_MAGIC\n"))))))
+ (base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags '("-Dpython-bindings=ON"
@@ -452,14 +439,6 @@ (define-public libtorrent-rasterbar
#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
- ;; https://github.com/arvidn/libtorrent/issues/7567
- ;; Remove when resolved. I would hope this to be fixed in 2.0.10.
- ;; Do not forget to remove the %v2_empty_file.torrent variable.
- (add-before 'configure 'copy-v2_empty_file.torrent
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (copy-file (assoc-ref (or native-inputs inputs)
- "%v2_empty_file.torrent")
- "test/test_torrents/v2_empty_file.torrent")))
(replace 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
(let* ((disabled-tests
@@ -502,8 +481,7 @@ (define-public libtorrent-rasterbar
(inputs (list boost openssl))
(native-inputs `(("libfaketime" ,libfaketime)
("python-wrapper" ,python-wrapper)
- ("pkg-config" ,pkg-config)
- ("%v2_empty_file.torrent" ,%v2_empty_file.torrent)))
+ ("pkg-config" ,pkg-config)))
(home-page "https://www.libtorrent.org/")
(synopsis "Feature-complete BitTorrent implementation")
(description
--
2.41.0
guix-patches <at> gnu.org:bug#69276; Package guix-patches.
(Tue, 06 Aug 2024 13:11:02 GMT) Full text and rfc822 format available.Message #11 received at 69276 <at> debbugs.gnu.org (full text, mbox):
From: Adam Faiz <adam.faiz <at> disroot.org> To: 69276 <at> debbugs.gnu.org Subject: [PATCH 2/2] gnu: libtorrent-rasterbar: Use gexps and new input style. Date: Tue, 6 Aug 2024 21:09:17 +0800
From 646cc0c6857c41564eda8ccc0ade07ae16a18a6c Mon Sep 17 00:00:00 2001
Message-ID: <646cc0c6857c41564eda8ccc0ade07ae16a18a6c.1722949379.git.adam.faiz <at> disroot.org>
In-Reply-To: <cover.1722949379.git.adam.faiz <at> disroot.org>
References: <cover.1722949379.git.adam.faiz <at> disroot.org>
From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
Date: Tue, 6 Aug 2024 20:55:13 +0800
Subject: [PATCH 2/2] gnu: libtorrent-rasterbar: Use gexps and new input style.
* gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]: Use gexps.
[native-inputs]: Drop labels.
---
gnu/packages/bittorrent.scm | 75 +++++++++++++++++++------------------
1 file changed, 38 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index abc598f7fa..fa2765da5b 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -433,33 +433,34 @@ (define-public libtorrent-rasterbar
(base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw"))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags '("-Dpython-bindings=ON"
- "-Dbuild_tests=ON")
- ;; Tests do not reliably work when executed in parallel.
- #:parallel-tests? #f
- #:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
- (let* ((disabled-tests
- '(
- ;; Requires a non-localhost IPv4 interface.
- "test_upnp"
- ;; test_ssl needs to be run separately.
- "test_ssl"))
- (exclude-regex (string-append "^("
- (string-join disabled-tests "|")
- ")$"))
- (timeout "600")
- (jobs (if parallel-tests?
- (number->string (parallel-job-count))
- "1")))
- (when tests?
- (invoke "ctest"
- "-E" exclude-regex
- "-j" jobs
- "--timeout" timeout
- "--output-on-failure")
+ (list
+ #:configure-flags
+ #~'("-Dpython-bindings=ON"
+ "-Dbuild_tests=ON")
+ ;; Tests do not reliably work when executed in parallel.
+ #:parallel-tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+ (let* ((disabled-tests
+ '(;; Requires a non-localhost IPv4 interface.
+ "test_upnp"
+ ;; test_ssl needs to be run separately.
+ "test_ssl"))
+ (exclude-regex (string-append "^("
+ (string-join disabled-tests "|")
+ ")$"))
+ (timeout "600")
+ (jobs (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")))
+ (when tests?
+ (invoke "ctest"
+ "-E" exclude-regex
+ "-j" jobs
+ "--timeout" timeout
+ "--output-on-failure")
;; test_ssl relies on bundled TLS certificates with a fixed
;; expiry date. To ensure succesful builds in the future,
;; fake the time to be roughly that of the release.
@@ -471,17 +472,17 @@ (define-public libtorrent-rasterbar
;;
;; Note: The test_ssl test times out in the ci.
;; Temporarily disable it until that is resolved.
- ;; (invoke "faketime" "2022-10-24"
- ;; "ctest"
- ;; "-R" "^test_ssl$"
- ;; "-j" jobs
- ;; "--timeout" timeout
- ;; "--output-on-failure")
- )))))))
+ #;(invoke "faketime" "2022-10-24"
+ "ctest"
+ "-R" "^test_ssl$"
+ "-j" jobs
+ "--timeout" timeout
+ "--output-on-failure"))))))))
(inputs (list boost openssl))
- (native-inputs `(("libfaketime" ,libfaketime)
- ("python-wrapper" ,python-wrapper)
- ("pkg-config" ,pkg-config)))
+ (native-inputs
+ (list libfaketime
+ python-wrapper
+ pkg-config))
(home-page "https://www.libtorrent.org/")
(synopsis "Feature-complete BitTorrent implementation")
(description
--
2.41.0
guix-patches <at> gnu.org:bug#69276; Package guix-patches.
(Sun, 06 Oct 2024 09:14:01 GMT) Full text and rfc822 format available.Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Z572 <zhengjunjie <at> iscas.ac.cn> To: Adam Faiz via Guix-patches via <guix-patches <at> gnu.org> Cc: 69276-done <at> debbugs.gnu.org, Adam Faiz <adam.faiz <at> disroot.org> Subject: Re: [bug#69276] [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10. Date: Sun, 06 Oct 2024 17:12:33 +0800
[Message part 1 (text/plain, inline)]
Adam Faiz via Guix-patches via <guix-patches <at> gnu.org> writes:
> From 4af05095ca922bb6d0335a6e946a404d4764ac1f Mon Sep 17 00:00:00 2001
> Message-ID: <4af05095ca922bb6d0335a6e946a404d4764ac1f.1722949379.git.adam.faiz <at> disroot.org>
> In-Reply-To: <cover.1722949379.git.adam.faiz <at> disroot.org>
> References: <cover.1722949379.git.adam.faiz <at> disroot.org>
> From: AwesomeAdam54321 <adam.faiz <at> disroot.org>
> Date: Tue, 6 Aug 2024 19:57:47 +0800
> Subject: [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10.
>
> * gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 2.0.10.
> [source]<snippet>: Remove test/test_copy_file.cpp patch since it's resolved.
> [native-inputs]: Remove no longer needed file (v2_empty_file.torrent).
> [arguments]<#:phases>: And remove a phase copying it into the correct place.
> ---
> gnu/packages/bittorrent.scm | 28 +++-------------------------
> 1 file changed, 3 insertions(+), 25 deletions(-)
>
> diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
> index 5c2fa9c688..abc598f7fa 100644
> --- a/gnu/packages/bittorrent.scm
> +++ b/gnu/packages/bittorrent.scm
> @@ -418,16 +418,10 @@ (define-public mktorrent
> (license (list l:public-domain ; sha1.*, used to build without OpenSSL
> l:gpl2+)))) ; with permission to link with OpenSSL
>
> -(define %v2_empty_file.torrent
> - (origin (method url-fetch)
> - (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent")
> - (sha256
> - (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn"))))
> -
> (define-public libtorrent-rasterbar
> (package
> (name "libtorrent-rasterbar")
> - (version "2.0.9")
> + (version "2.0.10")
> (source
> (origin
> (method url-fetch)
> @@ -436,14 +430,7 @@ (define-public libtorrent-rasterbar
> "releases/download/v" version "/"
> "libtorrent-rasterbar-" version ".tar.gz"))
> (sha256
> - (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch"))
> - ;; https://github.com/arvidn/libtorrent/issues/7566
> - ;; Remove when resolved. I would hope this to be fixed in 2.0.10.
> - (modules '((guix build utils)))
> - (snippet
> - #~(substitute* "test/test_copy_file.cpp"
> - (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all)
> - (string-append all ", TMPFS_MAGIC\n"))))))
> + (base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw"))))
> (build-system cmake-build-system)
> (arguments
> `(#:configure-flags '("-Dpython-bindings=ON"
> @@ -452,14 +439,6 @@ (define-public libtorrent-rasterbar
> #:parallel-tests? #f
> #:phases
> (modify-phases %standard-phases
> - ;; https://github.com/arvidn/libtorrent/issues/7567
> - ;; Remove when resolved. I would hope this to be fixed in 2.0.10.
> - ;; Do not forget to remove the %v2_empty_file.torrent variable.
> - (add-before 'configure 'copy-v2_empty_file.torrent
> - (lambda* (#:key native-inputs inputs #:allow-other-keys)
> - (copy-file (assoc-ref (or native-inputs inputs)
> - "%v2_empty_file.torrent")
> - "test/test_torrents/v2_empty_file.torrent")))
> (replace 'check
> (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
> (let* ((disabled-tests
> @@ -502,8 +481,7 @@ (define-public libtorrent-rasterbar
> (inputs (list boost openssl))
> (native-inputs `(("libfaketime" ,libfaketime)
> ("python-wrapper" ,python-wrapper)
> - ("pkg-config" ,pkg-config)
> - ("%v2_empty_file.torrent" ,%v2_empty_file.torrent)))
> + ("pkg-config" ,pkg-config)))
> (home-page "https://www.libtorrent.org/")
> (synopsis "Feature-complete BitTorrent implementation")
> (description
adjust message, not use #; , push and close.
[signature.asc (application/pgp-signature, inline)]
Z572 <zhengjunjie <at> iscas.ac.cn>:Tomas Volf <~@wolfsden.cz>:guix-patches <at> gnu.org:bug#69276; Package guix-patches.
(Sun, 06 Oct 2024 19:16:01 GMT) Full text and rfc822 format available.Message #22 received at 69276 <at> debbugs.gnu.org (full text, mbox):
From: John Kehayias <john.kehayias <at> protonmail.com> To: Tomas Volf <~@wolfsden.cz>, guix-devel <at> gnu.org Cc: 69276 <at> debbugs.gnu.org, Z572 <zhengjunjie <at> iscas.ac.cn>, Adam Faiz <adam.faiz <at> disroot.org> Subject: Re: 01/04: gnu: libtorrent-rasterbar: Update to 2.0.10. Date: Sun, 06 Oct 2024 19:15:16 +0000
Dear Tomas (and CC'ing the debbugs number, co-author, and committer Z572), On Sun, Oct 06, 2024 at 07:52 PM, Tomas Volf wrote: > guix-commits <at> gnu.org writes: > >> z572 pushed a commit to branch master >> in repository guix. >> >> commit 37dede4c4d8c25a786f2a2e2a17ba54b4ba6283f >> Author: Adam Faiz via Guix-patches via <guix-patches <at> gnu.org> >> AuthorDate: Tue Aug 6 21:07:40 2024 +0800 > > I have to admit I am not very happy regarding the change in the commit > author. While I understand the change itself might have been somewhat > trivial, I did work with upstream to merge the required changes for > 2.0.10, so having the authorship stolen like this leaves somewhat > unpleasant feeling. > I understand your frustration and while I thank you for bringing this to attention (we care about attribution here!), I do think this was escalated a tiny bit in the heat of the moment. I don't see this message in the original patch thread with the other author (Adam) and committer (Z572, still relatively new), so it is quite possible they didn't see this message you sent until now. I should say, I do think it is good to raise awareness so we can all do better, but I think we should try to give some benefit of the doubt and look for the best way forward. Mistakes happen! I had accidentally lost the author of some commits and realized after I had pushed them, raising this after with guix-devel and the original authors for what remedy they would like. Though everything was okay, I felt bad, and still do, but at least it has made me more vigilant. Let's remember we are all trying our best here and imagine ourselves on the other side. (Side note that upstream work to help out Guix and packaging is always welcome, so thank you for that! Though that is separate from authorship of commits on the Guix side, of course.) > Especially since applying for commit access has a number of commits as > one of prerequisites, having your address visible in `git log --author' > goes from "collecting internet points" into "actually somewhat > important". But even without that, I would still consider it not a nice > thing to do. > Part of having commit access is also accepting that mistakes will happen and you are expected to remedy, learn, and help us all do better (e.g. see <https://guix.gnu.org/manual/devel/en/html_node/Commit-Access.html>). This quality I would say is much more important than just number of contributions, though that experience is a more quantifiable prerequisite. As I hope a neutral third party, in this case I would suggest reverting the commits and then reapplying them with author/co-author set appropriately. I think this issue should have been brought up more directly with the parties involved, whether or not cc-ing guix-devel helps here I can't say. As I said, I at least take it as a reminder of our responsibilities and potential mistakes when we have commit access. While I could of course take this action myself, in following the link above, I leave it to those involved first. > Have a nice day, > Tomas Let me also thank you for your contributions! I look forward to one day seeing you announced as a new committer as you continue to contribute. But I hope when you are on that side and make a mistake, as we all do, that you are given the benefit of the doubt, a chance to rectify, and help us all do better. John PS: I know tone is hard and easily (wrongly) assumed in written communication. Let me stress that all I wrote was meant to be understanding to your perspective and feelings (which I'm sure many would share in the same circumstances!) while also helping us reach a mutually beneficial remedy.
guix-patches <at> gnu.org:bug#69276; Package guix-patches.
(Sun, 06 Oct 2024 22:04:01 GMT) Full text and rfc822 format available.Message #25 received at 69276 <at> debbugs.gnu.org (full text, mbox):
From: Tomas Volf <~@wolfsden.cz> To: John Kehayias <john.kehayias <at> protonmail.com> Cc: guix-devel <at> gnu.org, 69276 <at> debbugs.gnu.org, Z572 <zhengjunjie <at> iscas.ac.cn>, Adam Faiz <adam.faiz <at> disroot.org> Subject: Re: 01/04: gnu: libtorrent-rasterbar: Update to 2.0.10. Date: Mon, 07 Oct 2024 00:02:50 +0200
[Message part 1 (text/plain, inline)]
Hello John, John Kehayias <john.kehayias <at> protonmail.com> writes: > Dear Tomas (and CC'ing the debbugs number, co-author, and committer Z572), > > On Sun, Oct 06, 2024 at 07:52 PM, Tomas Volf wrote: > >> guix-commits <at> gnu.org writes: >> >>> z572 pushed a commit to branch master >>> in repository guix. >>> >>> commit 37dede4c4d8c25a786f2a2e2a17ba54b4ba6283f >>> Author: Adam Faiz via Guix-patches via <guix-patches <at> gnu.org> >>> AuthorDate: Tue Aug 6 21:07:40 2024 +0800 >> >> I have to admit I am not very happy regarding the change in the commit >> author. While I understand the change itself might have been somewhat >> trivial, I did work with upstream to merge the required changes for >> 2.0.10, so having the authorship stolen like this leaves somewhat >> unpleasant feeling. >> > > I understand your frustration and while I thank you for bringing this to > attention (we care about attribution here!), I do think this was escalated a > tiny bit in the heat of the moment. I don't see this message in the original > patch thread with the other author (Adam) and committer (Z572, still relatively > new), so it is quite possible they didn't see this message you sent until now. > > I should say, I do think it is good to raise awareness so we can all do better, > but I think we should try to give some benefit of the doubt and look for the > best way forward. Mistakes happen! I had accidentally lost the author of some > commits and realized after I had pushed them, raising this after with guix-devel > and the original authors for what remedy they would like. Though everything was > okay, I felt bad, and still do, but at least it has made me more vigilant. Let's > remember we are all trying our best here and imagine ourselves on the other > side. > > (Side note that upstream work to help out Guix and packaging is always > welcome, so thank you for that! Though that is separate from > authorship of commits on the Guix side, of course.) Hm, there is probably little bit of misunderstanding here. Yes, I was (am) a bit sad about this happening, but I did not really meant the email as an "escalation". And I did not send it to the debbugs bug first. I was just reacting to the commit I saw in guix-commits mailing list. It explicitly has guix-devel set as Reply-To (instead of, for example, the commit author), so I assumed here (guix-devel) is where should I raise the issue. I fully understand people (me included) make mistakes and I did not (and do not) assume ill intentions here. However, re-reading my original message I do think I should have taken a second breath and tune it down a notch (or two), for failing to do that I apologize. > >> Especially since applying for commit access has a number of commits as >> one of prerequisites, having your address visible in `git log --author' >> goes from "collecting internet points" into "actually somewhat >> important". But even without that, I would still consider it not a nice >> thing to do. >> > > Part of having commit access is also accepting that mistakes will happen and you > are expected to remedy, learn, and help us all do better (e.g. see > <https://guix.gnu.org/manual/devel/en/html_node/Commit-Access.html>). This > quality I would say is much more important than just number of contributions, > though that experience is a more quantifiable prerequisite. > > As I hope a neutral third party, in this case I would suggest reverting the > commits and then reapplying them with author/co-author set > appropriately. While I appreciate the suggestion from a neutral party, I do not insist on that. This is just one patch of many that I have sent (and hopefully will send). I would very much prefer z572 to spent time on merging new patches instead of redoing this one. Many of my patches were applied by z572, and I am grateful for their work. > I think this issue should have been brought up more directly with the > parties involved, whether or not cc-ing guix-devel helps here I can't > say. I reacted on this above already, but I will put up an explicit suggestion: Maybe the Reply-To on guix-commits should be the committer. > As I said, I at least take it as a reminder of our responsibilities > and potential mistakes when we have commit access. While I could of > course take this action myself, in following the link above, I leave > it to those involved first. > >> Have a nice day, >> Tomas > > Let me also thank you for your contributions! I look forward to one day seeing > you announced as a new committer as you continue to contribute. But I hope when > you are on that side and make a mistake, as we all do, that you are given the > benefit of the doubt, a chance to rectify, and help us all do better. As do I :) > > John > > PS: I know tone is hard and easily (wrongly) assumed in written > communication. Let me stress that all I wrote was meant to be understanding to > your perspective and feelings (which I'm sure many would share in the same > circumstances!) while also helping us reach a mutually beneficial > remedy. I appreciate your reply and calm, neutral view point trying to find a common way forward. Thank you for weighing in. Have a nice day, Tomas -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors.
[signature.asc (application/pgp-signature, inline)]
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Mon, 04 Nov 2024 12:24:17 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.