Merge lp:~chrish/bzr-pager/use-bzr-pager-env into lp:bzr-pager

Proposed by Christian Hudon
Status: Merged
Merged at revision: 15
Proposed branch: lp:~chrish/bzr-pager/use-bzr-pager-env
Merge into: lp:bzr-pager
Diff against target: 11 lines (+1/-1)
1 file modified
__init__.py (+1/-1)
To merge this branch: bzr merge lp:~chrish/bzr-pager/use-bzr-pager-env
Reviewer Review Type Date Requested Status
Lukáš Lalinský Approve
Review via email: mp+79486@code.launchpad.net

Description of the change

This branch makes bzr-pager look first in a $BZR_PAGER environment
variable for the pager to be used, allowing users to override
the general PAGER setting for bzr-pager if desired. This fixes
bug #769903.

To post a comment you must log in.
Revision history for this message
Lukáš Lalinský (luks) wrote :

Looks good to me.

review: Approve
Revision history for this message
Lukáš Lalinský (luks) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2011-06-17 13:35:18 +0000
3+++ __init__.py 2011-10-16 02:20:28 +0000
4@@ -27,7 +27,7 @@
5 if not target.isatty() or not hasattr(os, 'fork'):
6 return
7
8- pager = os.environ.get('PAGER', 'less').strip()
9+ pager = os.environ.get('BZR_PAGER', os.environ.get('PAGER', 'less')).strip()
10 if not pager or pager == 'cat':
11 return
12

Subscribers

People subscribed via source and target branches