[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1601496 - /subversion/trunk/tools/dist/dist.sh

From: Ben Reser <breser_at_apache.org>
Date: Tue, 10 Jun 2014 11:10:33 -0700

On 6/10/14, 2:12 AM, Bert Huijben wrote:
> This patch appears to have broken the nightly snapshot building job.
>
> http://ci.apache.org/builders/svn-trunk-nightly/builds/42
> http://ci.apache.org/builders/svn-trunk-nightly/builds/42/steps/shell/logs/stdio
> [[
> subprocess.CalledProcessError: Command '['/usr/home/buildslave27/slave27/svn-trunk-nightly/uploads/dist.sh', '-v', 'nightly', '-pr', 'trunk', '-r', '1601546', '-zip', '-nightly']' returned non-zero exit status 1
> ]]

Yup, it assumes that you can run shell scripts in the export. Which works fine
for the tarballs. But breaks on the zip file because we set the native
eol-style to CRLF. The shell ends up interpreting the CR as part of the
command and doesn't run properly.

I've fixed this in r1601708 and r1601714 by making dist.sh separately export
po-update.sh like we do for find_python.sh. Another option would have been
changing the eol-style on po-update from native to LF. But I suspect this
would have been reverted by some well meaning person in the future, breaking
this again. I have no idea if shell scripts being exported as CRLF is useful.
 In particular, do sh implementations on Windows deal with CRLF scripts? If
they don't then we probably should make this change from native to LF for all
our shell scripts.
Received on 2014-06-10 20:11:01 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.