Merge lp:~nobuto/bikeshed/lp677049 into lp:bikeshed

[Nobuto Murata]

bzrp passes "-F -R -X" options to pager.
That causes error with pagers which don't support those options.

I added test line for getting which pager is set.
And I made bzrp passing options only if less is set.

To get which pager is set, /etc/alternatives/pager is tested.
I think using "update-alternatives" like the line below is more general, but non-Debian systems don't seems to support "update-alternatives --query" command. So I get directly from /etc/alternatives.

$(update-alternatives --query pager | grep "Value:" | awk '{print $2}')

=== modified file 'bzrp'
--- bzrp	2010-10-21 17:06:48 +0000
+++ bzrp	2010-11-18 16:19:16 +0000
@@ -21,7 +21,10 @@
 
 cmd=$(shift)
 
-opts="-F -R -X"
+pager=$(readlink /etc/alternatives/pager)
+if [ $pager = /bin/less ]; then
+	opts="-F -R -X"
+fi
 # NOTE: The $opts are specific to vi-compatible pagers, like 'less'.
 #       It would be nice to have a better way of detecting this.
 #       Currently, these support:

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-09 23:45:59 +0000
+++ debian/changelog	2010-11-18 16:19:16 +0000
@@ -1,8 +1,10 @@
 bikeshed (1.6) unreleased; urgency=low
 
-  * UNRELEASED
+  [ Nobuto MURATA ]
+  * bzrp: avoid passing unsupported options to pager other than less,
+    LP: #677049
 
- -- Dustin Kirkland <[e-mail]>  Tue, 09 Nov 2010 17:45:59 -0600
+ -- Nobuto MURATA <[e-mail]>  Fri, 19 Nov 2010 00:52:40 +0900
 
 bikeshed (1.5-0ubuntu1) natty; urgency=low