summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorRyan Harper <ryan.harper@canonical.com>2016-03-04 09:51:05 -0600
committerRyan Harper <ryan.harper@canonical.com>2016-03-04 09:51:05 -0600
commit70acc910c3368980d7cb8971391a2c9dfaf3fda8 (patch)
treeb59d76e1f17c5a1ac41dd6619068e2e63a4461b8 /cloudinit
parent6aa82c9682406e03268939fff362a397b54fb9a4 (diff)
downloadvyos-cloud-init-70acc910c3368980d7cb8971391a2c9dfaf3fda8.tar.gz
vyos-cloud-init-70acc910c3368980d7cb8971391a2c9dfaf3fda8.zip
pep8: update formatting to pass pep8 1.4.6 (trusty) and 1.6.2 (xenial)
make check fails in a trusty sbuild due to different rules on older pep8. Fix formatting to pass in older and newer pep8.
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_rh_subscription.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py
index 6f474aed..6087c45c 100644
--- a/cloudinit/config/cc_rh_subscription.py
+++ b/cloudinit/config/cc_rh_subscription.py
@@ -126,10 +126,8 @@ class SubscriptionManager(object):
"(True/False "
return False, not_bool
- if (self.servicelevel is not None) and \
- ((not self.auto_attach) or
+ if (self.servicelevel is not None) and ((not self.auto_attach) or
(util.is_false(str(self.auto_attach)))):
-
no_auto = ("The service-level key must be used in conjunction "
"with the auto-attach key. Please re-run with "
"auto-attach: True")