Summary: | dispatch-conf: broken with portage-9999 (TypeError: diff_mixed() missing 1 required positional argument: 'file2') | ||
---|---|---|---|
Product: | Portage Development | Reporter: | Sam James <sam> |
Component: | Core | Assignee: | Portage team <dev-portage> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | kenrap |
Priority: | Normal | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
See Also: | https://bugs.gentoo.org/show_bug.cgi?id=837656 | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- |
Description
Sam James
2022-03-30 18:41:14 UTC
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/proj/portage.git/commit/?id=94dad3d64599f7e2c0c28e90ec4bee883746e385 commit 94dad3d64599f7e2c0c28e90ec4bee883746e385 Author: Kenneth Raplee <kenrap@kennethraplee.com> AuthorDate: 2022-03-30 22:47:33 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2022-03-30 23:11:43 +0000 dispatch_conf: fix arguments Closes: https://bugs.gentoo.org/836447 Signed-off-by: Kenneth Raplee <kenrap@kennethraplee.com> Signed-off-by: Sam James <sam@gentoo.org> lib/portage/dispatch_conf.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/proj/portage.git/commit/?id=3d63920030ec24996d6678ca0d7bce24abab6383 commit 3d63920030ec24996d6678ca0d7bce24abab6383 Author: Mike Gilbert <floppym@gentoo.org> AuthorDate: 2022-04-10 14:36:26 +0000 Commit: Mike Gilbert <floppym@gentoo.org> CommitDate: 2022-04-11 12:11:19 +0000 dispatch-conf: fix diffstatusoutput_mixed() usage This function should accept a command placeholder and two arguments. The command placeholder is used in 2 places: 1. User config: dispatch-conf.conf 2. Inline in portage.dispatch_conf.file_archive() We need to maintain the command placeholder format becaused of usage 1. Fixes: 7c8875c38b187fbd2e0fa5fc39bbb38c1588d0fb Bug: https://bugs.gentoo.org/836447 Bug: https://bugs.gentoo.org/837656 Closes: https://github.com/gentoo/portage/pull/805 Signed-off-by: Mike Gilbert <floppym@gentoo.org> lib/portage/dispatch_conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) https://gitweb.gentoo.org/proj/portage.git/commit/?id=51df6a3a490c46bcb40939be0691f59e2edbbd7b commit 51df6a3a490c46bcb40939be0691f59e2edbbd7b Author: Mike Gilbert <floppym@gentoo.org> AuthorDate: 2022-04-10 14:29:09 +0000 Commit: Mike Gilbert <floppym@gentoo.org> CommitDate: 2022-04-11 12:11:05 +0000 Revert "dispatch_conf: fix arguments" This is a step in the wrong direction, and causes another failure. Reverts: 94dad3d64599f7e2c0c28e90ec4bee883746e385. Bug: https://bugs.gentoo.org/836447 Bug: https://bugs.gentoo.org/837656 Signed-off-by: Mike Gilbert <floppym@gentoo.org> lib/portage/dispatch_conf.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) |