Thanks, applied to master.

On Sun, Apr 06, 2014 at 04:38:11PM -0700, Alex Wang wrote:
> Tested, and it works,
> 
> Acked-by: Alex Wang <al...@nicira.com>
> 
> 
> 
> 
> On Tue, Feb 25, 2014 at 11:32 AM, Ben Pfaff <b...@nicira.com> wrote:
> 
> > If the .git directory is there, and "git --version" works, but "git
> > ls-files" fails to print any file names (e.g. perhaps because .git is a
> > symlink to an inaccessible directory) then the "grep" command in the
> > thread-safety-check rule would hang forever because it had an empty list
> > of files and therefore expected to read from stdin.  This fixes the problem
> > by adding the name of an empty file to the command, which is harmless.
> >
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> >  Makefile.am |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Makefile.am b/Makefile.am
> > index 6a2aca2..1e0ace5 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -244,7 +244,7 @@ thread-safety-check:
> >         @if test -e '$(srcdir)'/.git && (git --version) >/dev/null 2>&1 &&
> > \
> >            grep -n -f '$(srcdir)'/build-aux/thread-safety-blacklist \
> >                `git ls-files '$(srcdir)' | grep '\.[ch]$$' \
> > -                | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` \
> > +                | $(EGREP) -v '^datapath|^lib/sflow|^third-party'`
> > /dev/null \
> >                | $(EGREP) -v ':[        ]*/?\*'; \
> >         then \
> >             echo "See above for list of calls to functions that are"; \
> > --
> > 1.7.10.4
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
> >
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to