diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-09-28 17:36:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-28 17:36:08 -0700 |
| commit | 0b12491de238eb6fb66a42019d8c83c59f0ad684 (patch) | |
| tree | fc15738d4a724b9a89edf639d347b3ea54caf4dc | |
| parent | dispatch-conf: support PAGER var for bug #384663 (diff) | |
| download | portage-0b12491de238eb6fb66a42019d8c83c59f0ad684.tar.gz portage-0b12491de238eb6fb66a42019d8c83c59f0ad684.tar.bz2 portage-0b12491de238eb6fb66a42019d8c83c59f0ad684.zip | |
dispatch-conf: tweak pager basename comparison
| -rwxr-xr-x | bin/dispatch-conf | 5 |
1 files 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 |