x/cloud-init
Code Issues Proposed changes

minor changes for pylint, write_boot_content improvement.

Browse Source 
if write_boot_content is given somethign that starts with #!,
then there isn't a reason to invoke 'file' to tell us that it
starts with shebang.

This way, we only run file in 2 cases:
 a.) binary content (don't really know if that is supported or not)
 b.) magic "user meant to run this with /bin/bash but couldn't be bothered to
     type that"
This commit is contained in:
Scott Moser 2014-01-24 20:13:38 -05:00
parent b77cde544d
commit 920328a872
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cloudinit/sources/DataSourceSmartOS.py
View File

@ -36,7 +36,6 @@ from cloudinit import util
import os import os
import os.path import os.path
import serial import serial
import subprocess
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -313,7 +312,8 @@ def dmi_data():
return (sys_uuid.lower().strip(), sys_type.strip()) return (sys_uuid.lower().strip(), sys_type.strip())
def write_boot_content(content, content_f, link=None, shebang=False, mode=0400): def write_boot_content(content, content_f, link=None, shebang=False,
mode=0400):
""" """
Write the content to content_f. Under the following rules: Write the content to content_f. Under the following rules:
1. If no content, remove the file 1. If no content, remove the file
@ -343,16 +343,15 @@ def write_boot_content(content, content_f, link=None, shebang=False, mode=0400):
util.write_file(content_f, content, mode=mode) util.write_file(content_f, content, mode=mode)
if shebang: if shebang and not content.startswith("#!"):
try: try:
cmd = ["file", "--brief", "--mime-type", content_f] cmd = ["file", "--brief", "--mime-type", content_f]
(f_type, _err) = util.subp(cmd) (f_type, _err) = util.subp(cmd)
LOG.debug("script %s mime type is %s" % (content_f, f_type)) LOG.debug("script %s mime type is %s", content_f, f_type)
line_one = content.splitlines()[0] if f_type.strip() == "text/plain":
if f_type.strip() == "text/plain" and "#!" not in line_one:
new_content = "\n".join(["#!/bin/bash", content]) new_content = "\n".join(["#!/bin/bash", content])
util.write_file(content_f, new_content, mode=mode) util.write_file(content_f, new_content, mode=mode)
LOG.debug("added shebang to file %s" % content_f) LOG.debug("added shebang to file %s", content_f)
except Exception as e: except Exception as e:
util.logexc(LOG, ("Failed to identify script type for %s" % util.logexc(LOG, ("Failed to identify script type for %s" %