Author: kwright
Date: Sun Jan 26 15:17:49 2014
New Revision: 1561505
URL: http://svn.apache.org/r1561505
Log:
Handle different line ends in script
Modified:
manifoldcf/release-scripts/create_release_branch.py
Modified: manifoldcf/release-scripts/create_release_branch.py
URL:
http://svn.apache.org/viewvc/manifoldcf/release-scripts/create_release_branch.py?rev=1561505&r1=1561504&r2=1561505&view=diff
==============================================================================
--- manifoldcf/release-scripts/create_release_branch.py (original)
+++ manifoldcf/release-scripts/create_release_branch.py Sun Jan 26 15:17:49 2014
@@ -19,6 +19,12 @@ def remove_dir(directory_path):
shutil.rmtree(directory_path)
#print "Pretend cleanup '%s'..." % directory_path
+def get_line_end(line):
+ """ Get the line end characters for the line """
+ if len(line) > 2 and line[len(line)-2] == '\r':
+ return "\r\n"
+ return "\n"
+
def match_change_txt_dev_line(line):
""" Find a line looking like this:
===== nnn-dev =====
@@ -29,8 +35,8 @@ def match_change_txt_dev_line(line):
end_index = line.find("-dev ===", index + 4)
return end_index != -1
-def make_change_txt_release_line(build_version):
- return "======================= Release %s =====================\r\n" %
build_version
+def make_change_txt_release_line(build_version, line_end):
+ return "======================= Release %s =====================%s" %
(build_version, line_end)
def set_change_file_release_row(change_file_path, release_version):
""" Convert the -dev row in a change file to a release row """
@@ -45,7 +51,7 @@ def set_change_file_release_row(change_f
out_fd.write(line)
else:
if match_change_txt_dev_line(line):
-
out_fd.write(make_change_txt_release_line(release_version))
+
out_fd.write(make_change_txt_release_line(release_version, get_line_end(line)))
converted = True
else:
out_fd.write(line)
@@ -62,8 +68,8 @@ def match_change_txt_add_line(line):
""" Look for a line with === in it """
return line.find("===") >= 0
-def make_change_txt_dev_line(dev_version):
- return "======================= %s-dev =====================\r\n" %
dev_version;
+def make_change_txt_dev_line(dev_version, line_end):
+ return "======================= %s-dev =====================%s" %
(dev_version, line_end);
def add_change_file_new_dev_row(change_file_path, dev_version):
""" Add a new -dev row to the start of a change file """
@@ -78,9 +84,10 @@ def add_change_file_new_dev_row(change_f
out_fd.write(line)
else:
if match_change_txt_add_line(line):
- out_fd.write(make_change_txt_dev_line(dev_version))
- out_fd.write("\r\n")
- out_fd.write("\r\n")
+ line_end = get_line_end(line)
+ out_fd.write(make_change_txt_dev_line(dev_version,
line_end))
+ out_fd.write(line_end)
+ out_fd.write(line_end)
out_fd.write(line)
added_row = True
else:
