Running `emerge --sync` returns the following error: >>> Syncing repository 'gentoo' into '/var/db/repos/gentoo'... emerge-delta-webrsync: error: Do not call emerge-delta-webrsync directly, instead call emerge --sync or emaint sync. !!! emerge-webrsync error in /var/db/repos/gentoo I am running `emerge --sync` and not `emerge-delta-webrsync` directly. Reproducible: Always Steps to Reproduce: 1. Run `emerge --sync` while /etc/portage/repos.conf is configured to use `webrsync` as the sync-type. Actual Results: The above error is produced. Expected Results: `emerge-delta-webrsync` should sync as expected.
Created attachment 866448 [details] repos.conf
Could you include emerge --info too please? Thanks.
Created attachment 866452 [details] `emerge --info` output
Created attachment 866453 [details] `emerge --info` output Correct `emerge --info` output.
Sorry, I had the webrsync lines commented out for the first `emerge --info` command I ran.
No problem - thank you! I need to check if this is emerge-delta-webrsync's fault or if I should fix it on the Portage side.
PORTAGE_GPG_DIR is missing since this commit from bug 905358: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2b94e25a1a8c0aad8c9c2a15ff8ef46d112e59f
Yeah, the new gpg validation logic from emerge-webrsync needs to be copied into emerge-delta-webrsync.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/proj/portage.git/commit/?id=0347637fe5033d3d8eb4fdafa1e86de171934819 commit 0347637fe5033d3d8eb4fdafa1e86de171934819 Author: Sam James <sam@gentoo.org> AuthorDate: 2023-08-19 13:31:19 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2023-08-19 13:33:47 +0000 misc/emerge-delta-webrsync: fix pgp verification Sync the logic with bin/emerge-webrsync to bring in the recent updates from portage-3.0.47 onwards. Bug: https://bugs.gentoo.org/911335 Signed-off-by: Sam James <sam@gentoo.org> NEWS | 4 + misc/emerge-delta-webrsync | 295 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 242 insertions(+), 57 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79fac453fc3672af989bd73821cdfe2588d740b3 commit 79fac453fc3672af989bd73821cdfe2588d740b3 Author: Sam James <sam@gentoo.org> AuthorDate: 2023-08-19 13:37:41 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2023-08-19 13:42:44 +0000 app-portage/emerge-delta-webrsync: add 3.7.7 Bug: https://bugs.gentoo.org/911335 Signed-off-by: Sam James <sam@gentoo.org> app-portage/emerge-delta-webrsync/Manifest | 1 + .../emerge-delta-webrsync-3.7.7.ebuild | 43 ++++++++++++++++++++++ 2 files changed, 44 insertions(+)
I've only lightly tested this and I think the code overall needs some more love (and syncing with emerge-webrsync, if not being entirely moved into it) but this seems good enough.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a68c0255b6d3132dd555b1519a035204bffde2 commit a6a68c0255b6d3132dd555b1519a035204bffde2 Author: Sam James <sam@gentoo.org> AuthorDate: 2023-08-20 07:57:47 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2023-08-20 07:58:22 +0000 sys-apps/portage: add 3.0.51 Bug: https://bugs.gentoo.org/587484 Closes: https://bugs.gentoo.org/673624 Closes: https://bugs.gentoo.org/691434 Closes: https://bugs.gentoo.org/835927 Closes: https://bugs.gentoo.org/909009 Closes: https://bugs.gentoo.org/911335 Closes: https://bugs.gentoo.org/911629 Closes: https://bugs.gentoo.org/911938 Signed-off-by: Sam James <sam@gentoo.org> sys-apps/portage/Manifest | 1 + sys-apps/portage/portage-3.0.51.ebuild | 234 +++++++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+)
