From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F423515808B for ; Mon, 11 Apr 2022 12:11:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1D80E093D; Mon, 11 Apr 2022 12:11:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4172AE0936 for ; Mon, 11 Apr 2022 12:11:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BE1D340F05 for ; Mon, 11 Apr 2022 12:11:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F15D3318 for ; Mon, 11 Apr 2022 12:11:52 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1649679079.3d63920030ec24996d6678ca0d7bce24abab6383.floppym@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/dispatch_conf.py X-VCS-Directories: lib/portage/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 3d63920030ec24996d6678ca0d7bce24abab6383 X-VCS-Branch: master Date: Mon, 11 Apr 2022 12:11:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 60e428f8-206b-4b3a-9324-b713a83ba109 X-Archives-Hash: 5a853beaccef573f7a72c0a060f5376b commit: 3d63920030ec24996d6678ca0d7bce24abab6383 Author: Mike Gilbert gentoo org> AuthorDate: Sun Apr 10 14:36:26 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 11 12:11:19 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3d639200 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 gentoo.org> lib/portage/dispatch_conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/dispatch_conf.py b/lib/portage/dispatch_conf.py index 6dbb1885e..ec2bc84d3 100644 --- a/lib/portage/dispatch_conf.py +++ b/lib/portage/dispatch_conf.py @@ -340,7 +340,7 @@ def file_archive(archive, curconf, newconf, mrgconf): # Archive the current config file if it isn't already saved if ( os.path.lexists(archive) - and len(diffstatusoutput_mixed(f"diff -aq '{curconf}' '{archive}'")[1]) != 0 + and len(diffstatusoutput_mixed("diff -aq '%s' '%s'", curconf, archive)[1]) != 0 ): _file_archive_rotate(archive)