Bug 19858

Summary: mergemasters interpretation of $PAGER is incorrect [PATCH]
Product: Base System Reporter: Brian Somers <brian>
Component: binAssignee: bill fumerola <billf>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: 5.0-CURRENT   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
mm-4.diff
none
mm-5.diff none

Description Brian Somers 2000-07-12 02:20:00 UTC
	Mergemaster treats ``more'' as an exception to it's requirement
that $PAGER specifies a full path name.  It also tests if ${PAGER%% *}
is executable which is incorrect when ${PAGER} is not absolute.

How-To-Repeat: 
	Run mergemaster with a $PAGER that contains a non-absolute path name.
Comment 1 Sheldon Hearn 2000-07-12 09:30:58 UTC
On Wed, 12 Jul 2000 02:09:26 +0100, brian@Awfulhak.org wrote:

> >Number:         19858
> >Category:       bin
> >Synopsis:       mergemasters interpretation of $PAGER is incorrect [PATCH]

Since Doug is not a committer, I can't assign this PR to him.  As far as
I know, he was going to come up with some text to clarify mergemaster's
handling of the PATH environment variable.

Ciao,
Sheldon.
Comment 2 Sheldon Hearn freebsd_committer freebsd_triage 2000-07-12 13:43:46 UTC
Responsible Changed
From-To: freebsd-bugs->billf

Over to the one of the two maintainers who is a committer.
Comment 3 Brian Somers 2000-07-12 14:04:47 UTC
> 
> 
> On Wed, 12 Jul 2000 02:09:26 +0100, brian@Awfulhak.org wrote:
> 
> > >Number:         19858
> > >Category:       bin
> > >Synopsis:       mergemasters interpretation of $PAGER is incorrect [PATCH]
> 
> Since Doug is not a committer, I can't assign this PR to him.  As far as
> I know, he was going to come up with some text to clarify mergemaster's
> handling of the PATH environment variable.

Yes.  I sent this patch to Doug and got no response.  While cleaning 
out the `M's in my tree I spotted this and figured I'd make the local 
modification go away.  Normally I'd commit, but as Doug has taken 
exception to previous commits to mergemaster, I used send-pr.

I'm sure Doug will find this eventually and either argue that it 
should be closed or committed :-)

> Ciao,
> Sheldon.

-- 
Brian <brian@Awfulhak.org>                        <brian@[uk.]FreeBSD.org>
      <http://www.Awfulhak.org>                   <brian@[uk.]OpenBSD.org>
Don't _EVER_ lose your sense of humour !
Comment 4 DougB 2000-07-12 17:36:14 UTC
Brian Somers wrote:
> 
> >
> >
> > On Wed, 12 Jul 2000 02:09:26 +0100, brian@Awfulhak.org wrote:
> >
> > > >Number:         19858
> > > >Category:       bin
> > > >Synopsis:       mergemasters interpretation of $PAGER is incorrect [PATCH]
> >
> > Since Doug is not a committer, I can't assign this PR to him.  As far as
> > I know, he was going to come up with some text to clarify mergemaster's
> > handling of the PATH environment variable.
> 
> Yes.  I sent this patch to Doug and got no response. 

	Sorry... I thought I'd responded to that. I had some mergemaster time
carved out over the Independence day holiday, but it got sucked up by
family commitments. I was planning to return to it this weekend. I need to
experiment with the behavior of your patch under various conditions, but it
looks like a good concept. 

> While cleaning
> out the `M's in my tree I spotted this and figured I'd make the local
> modification go away.  Normally I'd commit, but as Doug has taken
> exception to previous commits to mergemaster, I used send-pr.

	I appreciate the courtesy. 
 
> I'm sure Doug will find this eventually and either argue that it
> should be closed or committed :-)

	*Nod* Been extra busy at work lately, so I'm a day or two behind on my
freebsd mail. 

Doug
Comment 5 DougB 2000-07-27 22:13:09 UTC
brian@Awfulhak.org wrote:

> >Synopsis:       mergemasters interpretation of $PAGER is incorrect [PATCH]
> >Description:
> 
>         Mergemaster treats ``more'' as an exception to it's requirement
> that $PAGER specifies a full path name. 

	The reason being that it's contained in the PATH that mm already uses, so
I didn't need to worry about testing for it. 

> It also tests if ${PAGER%% *}
> is executable which is incorrect when ${PAGER} is not absolute.

	Yes, someone suggested that fix to me....  :)

	Your solution of using 'type' is quite elegant, and I've incorporated that
into the following patches for -Stable and -Current, along with the
previously discussed amendments to the message about PAGER, and taking the
presence of 'less' in the system into account. 

	Brian, please feel free to commit the attached patches. I sent them to
someone else already, but he hasn't responded yet. 

Thanks,

Doug
Comment 6 Brian Somers 2000-08-09 21:52:18 UTC
[.....]
> 	Brian, please feel free to commit the attached patches. I sent them to
> someone else already, but he hasn't responded yet. 

Sorry for the delay... I was away.

I've committed the changes, although the diffs didn't apply cleanly 
:-/

> Thanks,

Thank you.

> Doug

-- 
Brian <brian@Awfulhak.org>                        <brian@[uk.]FreeBSD.org>
      <http://www.Awfulhak.org>                   <brian@[uk.]OpenBSD.org>
Don't _EVER_ lose your sense of humour !
Comment 7 Brian Somers freebsd_committer freebsd_triage 2000-08-09 21:59:34 UTC
State Changed
From-To: open->closed

Fixed in -current.  I'll MFC in 1 week assuming no problems.