diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-01-17 12:42:44 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-01-17 12:42:44 -0500 |
| commit | 2f7227c7092ad873757167f62c2a82fb4ee69472 (patch) | |
| tree | acc620e1f0423910a4d0ea0d79ee231290e4a393 /cloudinit/CloudConfig/cc_grub_dpkg.py | |
| parent | 1d00c0936bfc63117493d89268da8c81611b3c40 (diff) | |
| parent | ec070cdf8746651d6dea011bd3ea9a445223028c (diff) | |
| download | vyos-cloud-init-2f7227c7092ad873757167f62c2a82fb4ee69472.tar.gz vyos-cloud-init-2f7227c7092ad873757167f62c2a82fb4ee69472.zip | |
fix pylint warnings (LP: #914739) [Juerg Haefliger]
This merge pulls in Jeurg's 'fix-pylint-warnings.tgz' patchset from
LP: #914739.
Diffstat (limited to 'cloudinit/CloudConfig/cc_grub_dpkg.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_grub_dpkg.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/cloudinit/CloudConfig/cc_grub_dpkg.py b/cloudinit/CloudConfig/cc_grub_dpkg.py index 97d79bdb..1437d481 100644 --- a/cloudinit/CloudConfig/cc_grub_dpkg.py +++ b/cloudinit/CloudConfig/cc_grub_dpkg.py @@ -20,23 +20,26 @@ import cloudinit.util as util import traceback import os -def handle(_name,cfg,_cloud,log,_args): +def handle(_name, cfg, _cloud, log, _args): - idevs=None - idevs_empty=None + idevs = None + idevs_empty = None if "grub-dpkg" in cfg: - idevs=util.get_cfg_option_str(cfg["grub-dpkg"], - "grub-pc/install_devices",None) - idevs_empty=util.get_cfg_option_str(cfg["grub-dpkg"], - "grub-pc/install_devices_empty",None) + idevs = util.get_cfg_option_str(cfg["grub-dpkg"], + "grub-pc/install_devices", None) + idevs_empty = util.get_cfg_option_str(cfg["grub-dpkg"], + "grub-pc/install_devices_empty", None) if (( os.path.exists("/dev/sda1") and not os.path.exists("/dev/sda") ) or ( os.path.exists("/dev/xvda1") and not os.path.exists("/dev/xvda") )): - if idevs == None: idevs="" - if idevs_empty == None: idevs_empty="true" + if idevs == None: + idevs = "" + if idevs_empty == None: + idevs_empty = "true" else: - if idevs_empty == None: idevs_empty="false" + if idevs_empty == None: + idevs_empty = "false" if idevs == None: idevs = "/dev/sda" for dev in ( "/dev/sda", "/dev/vda", "/dev/sda1", "/dev/vda1"): @@ -50,7 +53,7 @@ def handle(_name,cfg,_cloud,log,_args): dconf_sel = "grub-pc grub-pc/install_devices string %s\n" % idevs + \ "grub-pc grub-pc/install_devices_empty boolean %s\n" % idevs_empty log.debug("setting grub debconf-set-selections with '%s','%s'" % - (idevs,idevs_empty)) + (idevs, idevs_empty)) try: util.subp(('debconf-set-selections'), dconf_sel) |