On Thu, Jan 17, 2002 at 08:46:16PM +0100, Hugo van der Kooij wrote:
> On Thu, 17 Jan 2002, Hugo van der Kooij wrote:
>
> > On Thu, 17 Jan 2002, Renaud Deraison wrote:
> >
> > > Nessus 1.1.12 is in the CVS. It's basically the same as 1.1.11, plus
> > > some bugfixes (the export of the reports mostly). Before I make tarballs
> > > and release it, please 1.1.12-CVS users, send me your bug reports.
> >
> > Trouble.
> >
> > During compilation of nessus-core:
> >
> > gcc3 -g -O2 `sh ./cflags` -c utils.c
> > utils.c: In function `process_alive':
> > utils.c:889: parse error before '<<' token
> > utils.c:900: parse error before "if"
>
> Hmmm.
>
> This looks odd:
>
>
> int
> process_alive(pid)
> pid_t pid;
> <<<<<<< utils.c
> {
> /* while((waitpid(pid, NULL, WNOHANG) < 0) && errno == EINTR);
> /* do nothing */
>
>
> As this was the point where I made manual changes after a CVS download I
> removed the stated file to check it is not a local issue. Will let you
> know in a few minutes.
>
This is caused by conflicting changes in the CVS file and the local version,
since CVS couldn't figure out how to merge the changes, it marks them with
these marks, and expects you to figure out how they should merge and correct
the problem. If this is a local problem, then it's a conflict between your
version and the version in CVS, if this is actually in the repository, then
someone checked in a file that had conflicts, without correcting the conflicts
first...
--
Jason Kohles [EMAIL PROTECTED]
Senior System Architect (703)786-8036 (cellular)
Red Hat Professional Consulting (703)456-2940 (office)
