summaryrefslogtreecommitdiff
path: root/cloudinit/sources
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-01-16 20:11:27 -0500
committerScott Moser <smoser@ubuntu.com>2014-01-16 20:11:27 -0500
commit92aa725a284c08be9234bd792227e5896c4b1d1c (patch)
tree0d6b842e68d7504236263e8a07dd63f1802c56eb /cloudinit/sources
parent08b50a6ea239f480493f202c563d788cabb92380 (diff)
downloadvyos-cloud-init-92aa725a284c08be9234bd792227e5896c4b1d1c.tar.gz
vyos-cloud-init-92aa725a284c08be9234bd792227e5896c4b1d1c.zip
DataSourceOpenNebula:parse_shell_config skip 'SECONDS' var if seen
SECONDS is a special variable in bash, it gets set to the time the shell has been alive. This would cause us to fail randomly (if the process happened to take more than 1 second, then SECONDS would be defined).
Diffstat (limited to 'cloudinit/sources')
-rw-r--r--cloudinit/sources/DataSourceOpenNebula.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
index 07dc25ff..b0464cbb 100644
--- a/cloudinit/sources/DataSourceOpenNebula.py
+++ b/cloudinit/sources/DataSourceOpenNebula.py
@@ -323,7 +323,7 @@ def parse_shell_config(content, keylist=None, bash=None, asuser=None,
(output, _error) = util.subp(cmd, data=bcmd)
# exclude vars in bash that change on their own or that we used
- excluded = ("RANDOM", "LINENO", "_", "__v")
+ excluded = ("RANDOM", "LINENO", "SECONDS", "_", "__v")
preset = {}
ret = {}
target = None