x/cloud-init
Code Issues Proposed changes

pep8, use which rather than hard coded path

Browse Source
This commit is contained in:
Scott Moser 2014-01-23 16:13:09 -05:00
parent dbf5d00e6b
commit 7c3a12d516
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloudinit/config/cc_growpart.py
View File

@ -113,9 +113,10 @@ class ResizeGrowPart(object):
return (before, get_size(partdev)) return (before, get_size(partdev))
class ResizeGpart(object): class ResizeGpart(object):
def available(self): def available(self):
if not os.path.exists('/usr/local/sbin/gpart'): if not util.which('gpart'):
return False return False
return True return True
@ -138,7 +139,7 @@ class ResizeGpart(object):
try: try:
util.subp(["gpart", "resize", "-i", partnum, diskdev]) util.subp(["gpart", "resize", "-i", partnum, diskdev])
except util.ProcessExecutionError as e: except util.ProcessExecutionError as e:
util.logexc(LOG, "Failed: gpart resize -i %s %s", partnum, diskdev) util.logexc(LOG, "Failed: gpart resize -i %s %s", partnum, diskdev)
raise ResizeFailedException(e) raise ResizeFailedException(e)
# Since growing the FS requires a reboot, make sure we reboot # Since growing the FS requires a reboot, make sure we reboot
@ -147,6 +148,7 @@ class ResizeGpart(object):
return (before, get_size(partdev)) return (before, get_size(partdev))
def get_size(filename): def get_size(filename):
fd = os.open(filename, os.O_RDONLY) fd = os.open(filename, os.O_RDONLY)
try: try:

7
cloudinit/config/cc_power_state_change.py
View File

@ -30,12 +30,10 @@ frequency = PER_INSTANCE
EXIT_FAIL = 254 EXIT_FAIL = 254
#
# Returns the cmdline for the given process id. In Linux we can use procfs for
# this but on BSD there is /usr/bin/procstat.
#
def givecmdline(pid): def givecmdline(pid):
# Returns the cmdline for the given process id. In Linux we can use procfs
# for this but on BSD there is /usr/bin/procstat.
try: try:
# Example output from procstat -c 1 # Example output from procstat -c 1
# PID COMM ARGS # PID COMM ARGS
@ -50,6 +48,7 @@ def givecmdline(pid):
except IOError: except IOError:
return None return None
def handle(_name, cfg, _cloud, log, _args): def handle(_name, cfg, _cloud, log, _args):
try: try: