Patchwork [STABLE] docker: install less in Debian based distros

login
register
mail settings
Submitter Gregory Szorc
Date May 3, 2017, 12:56 a.m.
Message ID <3c3846ddf199cc96fb78.1493772971@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/20382/
State Changes Requested
Headers show

Comments

Gregory Szorc - May 3, 2017, 12:56 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1493772374 25200
#      Tue May 02 17:46:14 2017 -0700
# Branch stable
# Node ID 3c3846ddf199cc96fb781f3fbd62570a3dc7087d
# Parent  fbb5f4bf94928b98fa87871e84bb2ef972ec2d51
docker: install less in Debian based distros

Without this, test-diff-color.t fails in Docker with a bunch of
"missing pager command 'less', skipping pager" warnings. That's
arguably a bug in the test itself not skipping if the pager isn't
available. But since we'll want to run this test in Docker and the
test requires a pager, installing `less` is not wrong: it just
doesn't fix the underlying problem.
Yuya Nishihara - May 3, 2017, 2:41 a.m.
On Tue, 02 May 2017 17:56:11 -0700, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc <gregory.szorc@gmail.com>
> # Date 1493772374 25200
> #      Tue May 02 17:46:14 2017 -0700
> # Branch stable
> # Node ID 3c3846ddf199cc96fb781f3fbd62570a3dc7087d
> # Parent  fbb5f4bf94928b98fa87871e84bb2ef972ec2d51
> docker: install less in Debian based distros
> 
> Without this, test-diff-color.t fails in Docker with a bunch of
> "missing pager command 'less', skipping pager" warnings. That's
> arguably a bug in the test itself not skipping if the pager isn't
> available. But since we'll want to run this test in Docker and the
> test requires a pager, installing `less` is not wrong: it just
> doesn't fix the underlying problem.

Looks good. Perhaps contrib/debian/control should have Build-Depends on less
as well. Can you send V2?
Augie Fackler - May 4, 2017, 4:13 a.m.
On Wed, May 03, 2017 at 11:41:03AM +0900, Yuya Nishihara wrote:
> On Tue, 02 May 2017 17:56:11 -0700, Gregory Szorc wrote:
> > # HG changeset patch
> > # User Gregory Szorc <gregory.szorc@gmail.com>
> > # Date 1493772374 25200
> > #      Tue May 02 17:46:14 2017 -0700
> > # Branch stable
> > # Node ID 3c3846ddf199cc96fb781f3fbd62570a3dc7087d
> > # Parent  fbb5f4bf94928b98fa87871e84bb2ef972ec2d51
> > docker: install less in Debian based distros
> >
> > Without this, test-diff-color.t fails in Docker with a bunch of
> > "missing pager command 'less', skipping pager" warnings. That's
> > arguably a bug in the test itself not skipping if the pager isn't
> > available. But since we'll want to run this test in Docker and the
> > test requires a pager, installing `less` is not wrong: it just
> > doesn't fix the underlying problem.
>
> Looks good. Perhaps contrib/debian/control should have Build-Depends on less
> as well. Can you send V2?

Better would be to disable the pager in this test, since it's only
accidentally running. I think there was something along these lines on
default already that could be grafted to stable.

> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Augie Fackler - May 4, 2017, 4:29 a.m.
> On May 4, 2017, at 12:13 AM, Augie Fackler <raf@durin42.com> wrote:
> 
> On Wed, May 03, 2017 at 11:41:03AM +0900, Yuya Nishihara wrote:
>> On Tue, 02 May 2017 17:56:11 -0700, Gregory Szorc wrote:
>>> # HG changeset patch
>>> # User Gregory Szorc <gregory.szorc@gmail.com>
>>> # Date 1493772374 25200
>>> #      Tue May 02 17:46:14 2017 -0700
>>> # Branch stable
>>> # Node ID 3c3846ddf199cc96fb781f3fbd62570a3dc7087d
>>> # Parent  fbb5f4bf94928b98fa87871e84bb2ef972ec2d51
>>> docker: install less in Debian based distros
>>> 
>>> Without this, test-diff-color.t fails in Docker with a bunch of
>>> "missing pager command 'less', skipping pager" warnings. That's
>>> arguably a bug in the test itself not skipping if the pager isn't
>>> available. But since we'll want to run this test in Docker and the
>>> test requires a pager, installing `less` is not wrong: it just
>>> doesn't fix the underlying problem.
>> 
>> Looks good. Perhaps contrib/debian/control should have Build-Depends on less
>> as well. Can you send V2?
> 
> Better would be to disable the pager in this test, since it's only
> accidentally running. I think there was something along these lines on
> default already that could be grafted to stable.

Nuts. That’s already on stable. Ignore me.

> 
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@mercurial-scm.org
>> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/contrib/docker/debian-jessie b/contrib/docker/debian-jessie
--- a/contrib/docker/debian-jessie
+++ b/contrib/docker/debian-jessie
@@ -4,6 +4,7 @@  RUN apt-get update && apt-get install -y
   debhelper \
   dh-python \
   devscripts \
+  less \
   python \
   python-all-dev \
   python-docutils \
diff --git a/contrib/docker/ubuntu.template b/contrib/docker/ubuntu.template
--- a/contrib/docker/ubuntu.template
+++ b/contrib/docker/ubuntu.template
@@ -4,6 +4,7 @@  RUN apt-get update && apt-get install -y
   debhelper \
   dh-python \
   devscripts \
+  less \
   python \
   python-all-dev \
   python-docutils \