From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R94cM-0001td-Pd for garchives@archives.gentoo.org; Thu, 29 Sep 2011 00:36:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9269321C29C; Thu, 29 Sep 2011 00:36:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5D89221C29C for ; Thu, 29 Sep 2011 00:36:43 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D5FFA1B401B for ; Thu, 29 Sep 2011 00:36:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3CC5280042 for ; Thu, 29 Sep 2011 00:36:42 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <0b12491de238eb6fb66a42019d8c83c59f0ad684.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/dispatch-conf X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 0b12491de238eb6fb66a42019d8c83c59f0ad684 Date: Thu, 29 Sep 2011 00:36:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b1a83eac348b17db5cb16149695e116c commit: 0b12491de238eb6fb66a42019d8c83c59f0ad684 Author: Zac Medico gentoo org> AuthorDate: Thu Sep 29 00:36:08 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Sep 29 00:36:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0b12491d dispatch-conf: tweak pager basename comparison --- bin/dispatch-conf | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 55d7f13..9f245d5 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -104,12 +104,13 @@ class dispatch: if pager is None or not cmd_var_is_valid(pager): pager =3D "cat" =20 - if os.path.basename(pager) =3D=3D "less": + pager_basename =3D os.path.basename(portage.util.shlex_split(pag= er)[0]) + if pager_basename =3D=3D "less": less_opts =3D self.options.get("less-opts") if less_opts is not None and less_opts.strip(): pager +=3D " " + less_opts =20 - if os.path.basename(portage.util.shlex_split(pager)[0]) =3D=3D "= cat": + if pager_basename =3D=3D "cat": pager =3D "" else: pager =3D " | " + pager