Merge lp:~larryprice/libertine/cc-prevent-rewrite into lp:libertine

[Larry Price]

Preventing rewriting existing data in ContainersConfig.

Preventing rewriting existing data in ContainersConfig.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:392
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/372/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/712
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/583
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/583
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/583
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/583
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/722
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/703
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/703/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/703
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/703/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/703
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/703/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/703
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/703/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/372/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

+1

review: Approve

=== modified file 'python/libertine/ContainersConfig.py'
--- python/libertine/ContainersConfig.py	2017-01-25 18:48:36 +0000
+++ python/libertine/ContainersConfig.py	2017-02-07 14:21:45 +0000
@@ -102,21 +102,20 @@
         if not container:
             return
 
-        if (type(value) is str or
-            type(value) is bool):
-            container[key] = value
-        elif type(value) is dict:
-            if key not in container:
-                container[key] = [value]
-            else:
-                container[key].append(value)
-        elif type(value) is list:
-            if key not in container:
-                container[key] = value
-            else:
-                container[key] = container[key] + value
+        if type(value) is dict:
+            if key not in container:
+                newvalue = [value]
+            else:
+                newvalue = container[key].copy()
+                newvalue.append(value)
+        elif type(value) is list and key in container:
+            newvalue = container[key] + value
+        else:
+            newvalue = value
 
-        write_container_config_file(self.container_list)
+        if container.get(key, None) != newvalue:
+            container[key] = newvalue
+            write_container_config_file(self.container_list)
 
     def _set_array_object_value_by_key(self, container_id, array_key, object_key, matcher, key, value):
         container = self._get_container_entry(container_id)

=== modified file 'python/libertine/Libertine.py'
=== modified file 'python/libertine/LxdContainer.py'
=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2017-02-01 21:13:14 +0000
+++ tools/libertine-container-manager	2017-02-07 14:21:45 +0000
@@ -340,11 +340,7 @@
                 libertine.utils.get_logger().error("Configuring freeze is only valid on LXC and LXD container types.")
                 sys.exit(1)
 
-            current_freeze = self.containers_config.get_freeze_on_stop(container_id)
-            config_freeze = args.freeze == 'enable'
-
-            if current_freeze != config_freeze:
-               self.containers_config.update_freeze_on_stop(container_id, config_freeze)
+            self.containers_config.update_freeze_on_stop(container_id, args.freeze == 'enable')
 
         else:
             libertine.utils.get_logger().error("Configure called with no subcommand. See configure --help for usage.")