From 078f0fc644e640eacad316aeda7ee05eb8957aa3 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 11 Jul 2013 10:14:49 -0400 Subject: upstart_job.py: fix pylint and bad bad variable in _has_suitable_upstart --- cloudinit/handlers/upstart_job.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cloudinit') 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: -- cgit v1.2.3