From 0b12491de238eb6fb66a42019d8c83c59f0ad684 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 28 Sep 2011 17:36:08 -0700 Subject: dispatch-conf: tweak pager basename comparison --- bin/dispatch-conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 55d7f13d7..9f245d571 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 = "cat" - if os.path.basename(pager) == "less": + pager_basename = os.path.basename(portage.util.shlex_split(pager)[0]) + if pager_basename == "less": less_opts = self.options.get("less-opts") if less_opts is not None and less_opts.strip(): pager += " " + less_opts - if os.path.basename(portage.util.shlex_split(pager)[0]) == "cat": + if pager_basename == "cat": pager = "" else: pager = " | " + pager -- cgit v1.2.3-1-g7c22