[torquedev] Current build error in trunk

[Garrick Staples]

On Wed, Feb 13, 2008 at 11:33:18PM +1100, Chris Samuel alleged:
> Just gave up on waiting for Ubuntu to fix their
> kernel to include cpuset support and rolled my own.
> 
> Just updated trunk to the latest version and got
> this build error:
> 
> if gcc -DHAVE_CONFIG_H -I. -I. -I../../src/include  -I../../src/include -I../../src/resmom/linux -DPBS_MOM -DDEMUX=\"/usr/local/torque-trunk/sbin/pbs_demux\" -DRCP_PATH=\"/usr/bin/scp\" -DRCP_ARGS=\"-rpB\" -DPBS_SERVER_HOME=\"/var/spool/torque\" -DPBS_ENVIRON=\"/var/spool/torque/pbs_environment\"   -g -O2 -D_LARGEFILE64_SOURCE -W -Wall -Wno-unused-parameter -Wno-long-long -pedantic -Werror -MT mom_main.o -MD -MP -MF ".deps/mom_main.Tpo" -c -o mom_main.o mom_main.c; \
>         then mv -f ".deps/mom_main.Tpo" ".deps/mom_main.Po"; else rm -f ".deps/mom_main.Tpo"; exit 1; fi
> cc1: warnings being treated as errors
> mom_main.c: In function ‘setumask’:
> mom_main.c:2190: warning: unused variable ‘i’
> 
> Then found what looks like an unresolved conflict
> that has been committed back into trunk in
> src/resmom/start_exec.c at line 5842.
> 
> <<<<<<< .mine
>         /* FIXME: temp debugging info */
> 
>         sprintf(log_buffer,"about to move to taskset for job %s/%s.\n",
>           pjob->ji_qs.ji_jobid,nodeidbuf);
> 
>         log_err(-1,id,log_buffer);
> 
> =======
> >>>>>>> .r1852
> 
> Removing the conflict markers to leave just the code
> seems to let it compile OK.

Found another similar breakage in start_exec.c.  Checked in the fix.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.supercluster.org/pipermail/torquedev/attachments/20080213/ec967d1b/attachment.bin