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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 98C0F158091 for ; Wed, 8 Jun 2022 20:11:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA2C4E087E; Wed, 8 Jun 2022 20:11:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 AFF3FE087E for ; Wed, 8 Jun 2022 20:11:40 +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 A8EEB340EB2 for ; Wed, 8 Jun 2022 20:11:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B616105 for ; Wed, 8 Jun 2022 20:11:38 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1654718761.84fc1ec271328e064da8b2537112b724e5a4c3b5.dolsen@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/eshowkw/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/eshowkw/__init__.py pym/gentoolkit/eshowkw/display_pretty.py X-VCS-Directories: pym/gentoolkit/eshowkw/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 84fc1ec271328e064da8b2537112b724e5a4c3b5 X-VCS-Branch: master Date: Wed, 8 Jun 2022 20:11: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 24cfb395-ed9d-4118-af14-cd0cfb7c8813 X-Archives-Hash: da806e5d177a55f4be5118cbeff9a451 commit: 84fc1ec271328e064da8b2537112b724e5a4c3b5 Author: Brian Dolbec gentoo org> AuthorDate: Wed Jun 8 20:06:01 2022 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Jun 8 20:06:01 2022 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=84fc1ec2 eshowkw: Fix missing dash for -r? ebuilds in versionlist output Turns out the real issue causing the row alignment issue was this. The code inadvertently dropped the dash display which in turn caused the row alignment issue. Reverts: 4695379c1921865d7763669580ac909ea94db90d Gentoo-bug-url: https://bugs.gentoo.org/503366 Signed-off-by: Brian Dolbec gentoo.org> pym/gentoolkit/eshowkw/__init__.py | 2 +- pym/gentoolkit/eshowkw/display_pretty.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/gentoolkit/eshowkw/__init__.py b/pym/gentoolkit/eshowkw/__init__.py index c33c47a..ba6c076 100644 --- a/pym/gentoolkit/eshowkw/__init__.py +++ b/pym/gentoolkit/eshowkw/__init__.py @@ -49,7 +49,7 @@ def process_display(package, keywords, dbapi): content.extend(sep) content.extend(keywords.extra) header_length = keywords.length - content_length = portdata.version_length - 1 + content_length = portdata.version_length display(content, header, header_length, content_length, portdata.cp, topper) diff --git a/pym/gentoolkit/eshowkw/display_pretty.py b/pym/gentoolkit/eshowkw/display_pretty.py index 0629d7e..82fd446 100644 --- a/pym/gentoolkit/eshowkw/display_pretty.py +++ b/pym/gentoolkit/eshowkw/display_pretty.py @@ -125,6 +125,6 @@ class string_rotator: if x.find("+ -") != -1: x = x.replace(" ", "-") # strip all chars and remove empty lines - if not strip or len(x.strip(" |-")) > 0: + if not strip or len(x.strip(" |-")) > 0 or '-' in x: tmp.append(x) return tmp