summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-07-30 22:03:31 -0400
committerScott Moser <smoser@ubuntu.com>2015-07-30 22:03:31 -0400
commit89cb8245c86eaa3f8bd2aa943dcd1f1e485c3ff2 (patch)
tree4f7123fc9f44d8e69bf98072fd98900dbc263ce8
parentb5574a9925b29417a1b351e7b38c54bc7d144dba (diff)
downloadvyos-cloud-init-89cb8245c86eaa3f8bd2aa943dcd1f1e485c3ff2.tar.gz
vyos-cloud-init-89cb8245c86eaa3f8bd2aa943dcd1f1e485c3ff2.zip
fix namespace / local variable collision
-rwxr-xr-xbin/cloud-init6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/cloud-init b/bin/cloud-init
index 7f21e49f..1a905b17 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -623,7 +623,7 @@ def main():
if name in ("modules", "init"):
functor = status_wrapper
- reporting = True
+ report_on = True
if name == "init":
if args.local:
rname, rdesc = ("init-local", "searching for local datasources")
@@ -634,9 +634,9 @@ def main():
elif name == "single":
rname, rdesc = ("single/%s" % args.name,
"running single module %s" % args.name)
- reporting = args.report
+ report_on = args.report
- reporter = reporting.ReportStack(rname, rdesc, reporting=reporting)
+ reporter = reporting.ReportStack(rname, rdesc, reporting=report_on)
with reporter:
return util.log_time(
logfunc=LOG.debug, msg="cloud-init mode '%s'" % name,