$ sudo dispatch-conf conf-update.d pre-session Commiting uncommited changes before starting a configuration update session Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. [master dabe465] saving uncommitted changes in /etc prior to emerge run 2 files changed, 2 insertions(+) create mode 100644 portage/package.use/busybox Traceback (most recent call last): File "/usr/lib/python-exec/python3.10/dispatch-conf", line 587, in <module> d.grind(portage.util.shlex_split(portage.settings.get("CONFIG_PROTECT", ""))) File "/usr/lib/python-exec/python3.10/dispatch-conf", line 309, in grind confs = [x for x in confs if f(x)] File "/usr/lib/python-exec/python3.10/dispatch-conf", line 309, in <listcomp> confs = [x for x in confs if f(x)] File "/usr/lib/python-exec/python3.10/dispatch-conf", line 220, in f mrgfail = portage.dispatch_conf.file_archive( File "/usr/lib/python3.10/site-packages/portage/dispatch_conf.py", line 343, in file_archive and len(diffstatusoutput_mixed(f"diff -aq '{curconf}' '{archive}'")[1]) != 0 File "/usr/lib/python3.10/site-packages/portage/dispatch_conf.py", line 105, in __call__ return diff_mixed( TypeError: diff_mixed() missing 1 required positional argument: 'file2' ---- Portage 3.0.30 (python 3.10.4-final-0, default/linux/amd64/17.1/hardened, gcc-11.2.1, glibc-2.35-r1, 5.15.32-gentoo-dist-hardened x86_64) ================================================================= System Settings ================================================================= System uname: Linux-5.15.32-gentoo-dist-hardened-x86_64-AMD_Ryzen_9_3950X_16-Core_Processor-with-glibc2.35 KiB Mem: 65830324 total, 32801380 free KiB Swap: 16777212 total, 16777212 free Timestamp of repository gentoo: Wed, 30 Mar 2022 17:49:44 +0000 Head commit of repository gentoo: a431d03611559ed456018feb16cddded95404302 Timestamp of repository kde: Tue, 29 Mar 2022 11:04:31 +0000 Head commit of repository kde: 7f1a791eff2289823d5f0bea800baccb20f5f813 Timestamp of repository qt: Mon, 28 Mar 2022 20:04:54 +0000 Head commit of repository qt: 88c405b8fc2910bdd59101ee31f6a3e46aed15c5 Timestamp of repository sam_c: Mon, 28 Mar 2022 20:05:08 +0000 Head commit of repository sam_c: 95bf9474db560f10eaf424ea9a0463ea947856ba Timestamp of repository steam-overlay: Fri, 25 Mar 2022 20:09:27 +0000 Head commit of repository steam-overlay: 56ef3833617c6ee33bd01a07a704a1167cf9a27e sh dash 0.5.11.5 ld GNU ld (Gentoo 2.38 p3) 2.38 ccache version 4.5.1 [disabled] app-misc/pax-utils: 1.3.3::gentoo app-shells/bash: 5.1_p16::gentoo dev-java/java-config: 2.3.1::gentoo dev-lang/perl: 5.34.1::gentoo dev-lang/python: 3.8.13::gentoo, 3.9.12::gentoo, 3.10.4::gentoo dev-lang/rust-bin: 1.59.0::gentoo dev-util/ccache: 4.5.1::gentoo dev-util/cmake: 3.23.0::gentoo dev-util/meson: 0.61.4-r2::gentoo sys-apps/baselayout: 2.8::gentoo sys-apps/sandbox: 2.29::gentoo sys-apps/systemd: 250.4-r1::gentoo sys-devel/autoconf: 2.13-r1::gentoo, 2.71-r1::gentoo sys-devel/automake: 1.16.5::gentoo sys-devel/binutils: 2.38-r1::gentoo sys-devel/binutils-config: 5.4.1::gentoo sys-devel/clang: 12.0.1::gentoo, 13.0.1::gentoo, 14.0.0-r1::gentoo sys-devel/gcc: 9.4.0::gentoo, 10.3.1_p20211126::gentoo, 11.2.1_p20220326::sam_c sys-devel/gcc-config: 2.5-r1::gentoo sys-devel/libtool: 2.4.7::gentoo sys-devel/lld: 13.0.1::gentoo sys-devel/llvm: 12.0.1::gentoo, 13.0.1::gentoo, 14.0.0::gentoo sys-devel/make: 4.3::gentoo sys-kernel/linux-headers: 5.17::gentoo (virtual/os-headers) sys-libs/glibc: 2.35-r1::gentoo Repositories: gentoo location: /var/db/repos/gentoo sync-type: git sync-uri: https://github.com/gentoo-mirror/gentoo.git priority: -1000 sync-git-clone-extra-opts: -b stable -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now sync-git-verify-commit-signature: yes crossdev location: /var/db/repos/crossdev masters: gentoo kde location: /var/db/repos/kde sync-type: git sync-uri: https://github.com/gentoo-mirror/kde.git masters: gentoo qt location: /var/db/repos/qt sync-type: git sync-uri: https://github.com/gentoo-mirror/qt.git masters: gentoo sam_c location: /var/db/repos/sam_c sync-type: git sync-uri: https://github.com/gentoo-mirror/sam_c.git masters: gentoo steam-overlay location: /var/db/repos/steam-overlay sync-type: git sync-uri: https://github.com/gentoo-mirror/steam-overlay.git masters: gentoo ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="@FREE" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php8.1/ext-active/ /etc/php/cgi-php8.1/ext-active/ /etc/php/cli-php8.1/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c" CXXFLAGS="-O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches" DISTDIR="/var/cache/distfiles" EMERGE_DEFAULT_OPTS="--keep-going --with-bdeps=y --complete-graph --deep --dynamic-deps=n --changed-deps=n --usepkg-exclude sys-fs/zfs --usepkg-exclude sys-fs/zfs-kmod --usepkg=y --implicit-system-deps=n --jobs=2 --load-average 32" ENV_UNSET="CARGO_HOME DBUS_SESSION_BUS_ADDRESS DISPLAY GOBIN GOPATH PERL5LIB PERL5OPT PERLPREFIX PERL_CORE PERL_MB_OPT PERL_MM_OPT XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR" FCFLAGS="-O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches" FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs buildpkg-live cgroup clean-logs config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox mount-sandbox multilib-strict network-sandbox news parallel-fetch parallel-install pid-sandbox preserve-libs protect-owned qa-unresolved-soname-deps sandbox sfperms split-log strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr" FFLAGS="-O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches" GENTOO_MIRRORS="http://mirror.bytemark.co.uk/gentoo/ http://www.mirrorservice.org/sites/distfiles.gentoo.org/ http://mirrors.soeasyto.com/distfiles.gentoo.org/" LANG="en_GB.UTF-8" LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--defsym=__gentoo_check_ldflags__=0" LINGUAS="en en_GB" MAKEOPTS="-j32 -l32" PKGDIR="/var/cache/binpkgs" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git" PORTAGE_TMPDIR="/var/tmp" SHELL="/bin/bash" USE="PIC X a52 aac acl acpi activities aes alsa amd64 avx avx2 bash-completion bluetooth branding bzip2 cairo caps cdda cdr crypt dbus declarative dist-kernel dri dts dvd dvdr emacs encode exif f16c filecaps firewalld flac fma3 freetype gif gmp gpm graphite gtk gui hardened harfbuzz hunspell iconv icu ipv6 jit jpeg kde kdesu kwallet lcms libglvnd libnotify libtirpc llvm-libunwind mad mmx mmxext mng mp3 mp4 mpeg multilib ncurses nls nptl ogg opengl openmp pam pango pclmul pcre pdf pgo pie plasma png policykit popcnt ppds pulseaudio qml qt5 rdrand readline sdl seccomp semantic-desktop sha spell split-usr sse sse2 sse3 sse4_1 sse4_2 sse4a ssl ssp ssse3 startup-notification svg system-av1 system-binutils system-boost system-bootstrap system-cairo system-clang system-digest system-ffmpeg system-harfbuzz system-heimdal system-icu system-jpeg system-leveldb system-libevent system-libs system-libvpx system-libyaml system-lz4 system-mitkrb5 system-sqlite system-ssl system-tbb system-uulib system-webp system-zlib systemd threads tiff truetype udev udisks unicode upower usb verify-sig vorbis vulkan wayland widgets x264 xattr xcb xml xtpax xv xvid zfs zlib zsh-completion" ABI_X86="32 64" ADA_TARGET="gnat_2020" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="karbon sheets words" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="libinput" KERNEL="linux" L10N="en en-GB" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LLVM_TARGETS="AArch64 AMDGPU ARM AVR BPF Hexagon Lanai MSP430 Mips NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore" LUA_SINGLE_TARGET="lua5-1" LUA_TARGETS="lua5-1" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php7-4 php8-0" POSTGRES_TARGETS="postgres12 postgres13" PYTHON_SINGLE_TARGET="python3_9" PYTHON_TARGETS="python3_9 python3_10 python3_8" QEMU_USER_TARGETS="aarch64 hppa ppc64le sparc64" RUBY_TARGETS="ruby26 ruby27" USERLAND="GNU" VIDEO_CARDS="amdgpu radeonsi radeon" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq proto steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: ADDR2LINE, AR, ARFLAGS, AS, ASFLAGS, CC, CCLD, CONFIG_SHELL, CPP, CPPFLAGS, CTARGET, CXX, CXXFILT, ELFEDIT, EXTRA_ECONF, F77FLAGS, FC, GCOV, GPROF, INSTALL_MASK, LC_ALL, LD, LEX, LFLAGS, LIBTOOL, MAKE, MAKEFLAGS, NM, OBJCOPY, OBJDUMP, PORTAGE_BINHOST, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, RANLIB, READELF, RUSTFLAGS, SIZE, STRINGS, STRIP, YACC, YFLAGS ================================================================= Package Settings ================================================================= sys-apps/portage-9999::gentoo was built with the following: USE="(ipc) native-extensions rsync-verify (xattr) -apidoc -build -doc -gentoo-dev (-selinux) -test" ABI_X86="(64)" PYTHON_TARGETS="python3_10 python3_8 python3_9 -pypy3" FEATURES="qa-unresolved-soname-deps ipc-sandbox strict split-log xattr parallel-fetch config-protect-if-modified userpriv unmerge-orphans unknown-features-warn usersync news assume-digests binpkg-docompress mount-sandbox sandbox usersandbox multilib-strict protect-owned clean-logs fixlafiles unmerge-logs distlocks sfperms network-sandbox preserve-libs buildpkg-live cgroup userfetch parallel-install binpkg-logs pid-sandbox ebuild-locks binpkg-dostrip"
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(-)
