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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 816171396D0 for ; Sun, 27 Aug 2017 09:33:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C405AE0E43; Sun, 27 Aug 2017 09:33:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2369E0E43 for ; Sun, 27 Aug 2017 09:33:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CDD73417C9 for ; Sun, 27 Aug 2017 09:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB4FA843E for ; Sun, 27 Aug 2017 09:33:38 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1503826397.aac6f2ab43afb78bd183a6d4a06c131cf70bba51.grobian@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: aac6f2ab43afb78bd183a6d4a06c131cf70bba51 X-VCS-Branch: master Date: Sun, 27 Aug 2017 09:33:38 +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-Archives-Salt: 4a1fa509-6d47-4d5d-baae-777485136029 X-Archives-Hash: 448a59ed99234d0398e8f8d903e9a830 commit: aac6f2ab43afb78bd183a6d4a06c131cf70bba51 Author: Fabian Groffen gentoo org> AuthorDate: Thu Aug 24 13:21:26 2017 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Aug 27 09:33:17 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=aac6f2ab _collision_protect: report progress in work todo Currently Portage reports its progress in checking collisions forward every 1000th file like so: * checking 4149 files for package collisions 1000 files checked ... 2000 files checked ... 3000 files checked ... 4000 files checked ... >>> Merging sys-apps/portage-2.3.8 to / Change it to countdown style so it is easier to anticipate what the next action will be: * checking 4149 files for package collisions 3149 files remaining ... 2149 files remaining ... 1149 files remaining ... 149 files remaining ... >>> Merging sys-apps/portage-2.3.8 to / Reviewed-by: Zac Medico gentoo.org> pym/portage/dbapi/vartree.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 7c8f150bb..04a40b732 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3420,13 +3420,14 @@ class dblink(object): dirs_ro = set() symlink_collisions = [] destroot = self.settings['ROOT'] + totfiles = len(file_list) + len(symlink_list) showMessage(_(" %s checking %d files for package collisions\n") % \ - (colorize("GOOD", "*"), len(file_list) + len(symlink_list))) + (colorize("GOOD", "*"), totfiles)) for i, (f, f_type) in enumerate(chain( ((f, "reg") for f in file_list), ((f, "sym") for f in symlink_list))): if i % 1000 == 0 and i != 0: - showMessage(_("%d files checked ...\n") % i) + showMessage(_("%d files remaining ...\n") % (totfiles - i)) dest_path = normalize_path( os.path.join(destroot, f.lstrip(os.path.sep)))