subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r1189580 - /subversion/trunk/build/
Date Thu, 27 Oct 2011 02:07:36 GMT
Author: gstein
Date: Thu Oct 27 02:07:35 2011
New Revision: 1189580

Fix SQL transformation on Windows (and NetWare) builds. The \r\n pattern
messed up the output files.

Reported by: NormW <normw{_AT_}>

* build/
  (Processor.process_file): strip trailing whitespace from the line before
    placing it into the output. this will clear off a \r character, and
    any potential trailing spaces. (continue to add a space in the format
    string so that string-joining does not create something like:
    "... FROM tableWHERE ...") we keep leading whitespace for nice
    indentation of the queries.


Modified: subversion/trunk/build/
--- subversion/trunk/build/ (original)
+++ subversion/trunk/build/ Thu Oct 27 02:07:35 2011
@@ -129,7 +129,7 @@ class Processor(object):
         # got something besides whitespace. write it out. include some whitespace
         # to separate the SQL commands. and a backslash to continue the string
         # onto the next line.
-        self.output.write('  "%s " \\\n' % line)
+        self.output.write('  "%s " \\\n' % line.rstrip())
     # previous line had a continuation. end the madness.

View raw message