From 371561772c9073daf9033145b4b2156bc9f0e7dc Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Mon, 4 Apr 2011 12:45:01 -0400
Subject: convert some user input from dos to unix (LP: #744965)

If user input is a consumed as a user-script, a boothook, or a upstart
job and appears to be dos-formated, then change it to unix formated

LP: #744965
---
 cloudinit/util.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'cloudinit/util.py')

diff --git a/cloudinit/util.py b/cloudinit/util.py
index fc4233de..8f6a6b0d 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -389,3 +389,9 @@ def shellify(cmdlist):
         else:
             content="%s%s\n" % ( content, str(args) )
     return content
+
+def dos2unix(input):
+    # find first end of line
+    pos = input.find('\n')
+    if pos <= 0 or input[pos-1] != '\r': return(input)
+    return(input.replace('\r\n','\n'))
-- 
cgit v1.2.3