From bbd238943386c2a10869ffe3694fcb461a1ded2d Mon Sep 17 00:00:00 2001
From: Peter Hofmann <scm@uninformativ.de>
Date: Tue, 21 Feb 2017 11:28:44 +0100
Subject: [PATCH 1/2] systemd: Support 'None' as value for 'running'

We often have situations where we don't want bw to start or stop a
daemon. Maybe enable it, but don't force start/stop.
---
 bundlewrap/items/svc_systemd.py   | 29 ++++++++++++++++-------------
 docs/content/items/svc_systemd.md |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/bundlewrap/items/svc_systemd.py b/bundlewrap/items/svc_systemd.py
index c6279975d..43f44432b 100644
--- a/bundlewrap/items/svc_systemd.py
+++ b/bundlewrap/items/svc_systemd.py
@@ -45,6 +45,7 @@ class SvcSystemd(Item):
     A service managed by systemd.
     """
     BUNDLE_ATTRIBUTE_NAME = "svc_systemd"
+    # bw 3.0: Both should default to True.
     ITEM_ATTRIBUTES = {
         'enabled': None,
         'running': True,
@@ -58,26 +59,25 @@ def __repr__(self):
             self.attributes['running'],
         )
 
-    # Note for bw 3.0: We're planning to make "True" the default value
-    # for "enabled". Once that's done, we can remove this custom cdict.
     def cdict(self):
-        cdict = self.attributes.copy()
-        if 'enabled' in cdict and cdict['enabled'] is None:
-            del cdict['enabled']
+        cdict = {}
+        for option, value in self.attributes.items():
+            if value is not None:
+                cdict[option] = value
         return cdict
 
     def fix(self, status):
         if 'enabled' in status.keys_to_fix:
-            if self.attributes['enabled'] is False:
-                svc_disable(self.node, self.name)
-            else:
+            if self.attributes['enabled']:
                 svc_enable(self.node, self.name)
+            else:
+                svc_disable(self.node, self.name)
 
         if 'running' in status.keys_to_fix:
-            if self.attributes['running'] is False:
-                svc_stop(self.node, self.name)
-            else:
+            if self.attributes['running']:
                 svc_start(self.node, self.name)
+            else:
+                svc_stop(self.node, self.name)
 
     def get_canned_actions(self):
         return {
@@ -100,9 +100,12 @@ def sdict(self):
     @classmethod
     def validate_attributes(cls, bundle, item_id, attributes):
         for attribute in ('enabled', 'running'):
-            if not isinstance(attributes.get(attribute, True), bool):
+            if (
+                not isinstance(attributes.get(attribute, True), bool) and
+                not attributes.get(attribute, None) is None
+            ):
                 raise BundleError(_(
-                    "expected boolean for '{attribute}' on {item} in bundle '{bundle}'"
+                    "expected boolean or None for '{attribute}' on {item} in bundle '{bundle}'"
                 ).format(
                     attribute=attribute,
                     bundle=bundle.name,
diff --git a/docs/content/items/svc_systemd.md b/docs/content/items/svc_systemd.md
index 38f4d7c4d..3021b87ca 100644
--- a/docs/content/items/svc_systemd.md
+++ b/docs/content/items/svc_systemd.md
@@ -28,7 +28,7 @@ See also: [The list of generic builtin item attributes](../repo/bundles.md#built
 
 ### running
 
-`True` if the service is expected to be running on the system; `False` if it should be stopped.
+`True` if the service is expected to be running on the system; `False` if it should be stopped. `None` makes BundleWrap ignore this setting.
 
 <br>
 

From 0adab4bf97681c867387746077c2c4ad0c273873 Mon Sep 17 00:00:00 2001
From: Peter Hofmann <scm@uninformativ.de>
Date: Tue, 21 Feb 2017 17:56:02 +0100
Subject: [PATCH 2/2] svc_systemd.py: Use shortcut as suggested

---
 bundlewrap/items/svc_systemd.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bundlewrap/items/svc_systemd.py b/bundlewrap/items/svc_systemd.py
index 43f44432b..c6f70f458 100644
--- a/bundlewrap/items/svc_systemd.py
+++ b/bundlewrap/items/svc_systemd.py
@@ -100,10 +100,7 @@ def sdict(self):
     @classmethod
     def validate_attributes(cls, bundle, item_id, attributes):
         for attribute in ('enabled', 'running'):
-            if (
-                not isinstance(attributes.get(attribute, True), bool) and
-                not attributes.get(attribute, None) is None
-            ):
+            if attributes.get(attribute, None) not in (True, False, None):
                 raise BundleError(_(
                     "expected boolean or None for '{attribute}' on {item} in bundle '{bundle}'"
                 ).format(