summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-07-11 10:14:49 -0400
committerScott Moser <smoser@ubuntu.com>2013-07-11 10:14:49 -0400
commit078f0fc644e640eacad316aeda7ee05eb8957aa3 (patch)
treeea029da73a89b1fa1f3f9e8226823efce12327b2
parentcbfc6f664d4927d4d0f542202db6f24bd2d64063 (diff)
downloadvyos-cloud-init-078f0fc644e640eacad316aeda7ee05eb8957aa3.tar.gz
vyos-cloud-init-078f0fc644e640eacad316aeda7ee05eb8957aa3.zip
upstart_job.py: fix pylint and bad bad variable in _has_suitable_upstart
-rw-r--r--cloudinit/handlers/upstart_job.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/handlers/upstart_job.py b/cloudinit/handlers/upstart_job.py
index b3d60d6e..7a73d1b2 100644
--- a/cloudinit/handlers/upstart_job.py
+++ b/cloudinit/handlers/upstart_job.py
@@ -85,7 +85,7 @@ def _has_suitable_upstart():
return False
# expecting 'initctl version' to output something like: init (upstart X.Y)
- if re.match("upstart 1.[0-7][\)]", version_out):
+ if re.match("upstart 1.[0-7][)]", version_out):
return False
if "upstart 0." in version_out:
return False
@@ -101,8 +101,8 @@ def _has_suitable_upstart():
return False
try:
+ good = "1.8-0ubuntu1.2"
util.subp(["dpkg", "--compare-versions", dpkg_ver, "ge", good])
- print "good version"
return True
except util.ProcessExecutionError as e:
if e.exit_code is 1: