Merge lp:~townsend/libertine/fix-lxc-create-fail into lp:libertine

[Christopher Townsend]

Only set the log file config if the container is already defined.

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

FAILED: Continuous integration, rev:250
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/264/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/267
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/226
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/226
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/226
    FAILURE: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/226/console
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1162/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/264/rebuild

review: Needs Fixing (continuous-integration)

[Larry Price (larryprice)]

hotfix approved

review: Approve

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

PASSED: Continuous integration, rev:250
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/265/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/268
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/227
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/227
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/227
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/227
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1163/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/265/rebuild

review: Approve (continuous-integration)

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2016-06-10 20:41:45 +0000
+++ python/libertine/LxcContainer.py	2016-06-22 16:28:16 +0000
@@ -84,9 +84,11 @@
         super().__init__(container_id)
         self.container_type = "lxc"
         self.container = lxc_container(container_id)
-        self.lxc_log_file = os.path.join(tempfile.mkdtemp(), 'lxc-start.log')
-        self.container.append_config_item("lxc.logfile", self.lxc_log_file)
-        self.container.append_config_item("lxc.logpriority", "3")
+
+        if self.container.defined:
+            self.lxc_log_file = os.path.join(tempfile.mkdtemp(), 'lxc-start.log')
+            self.container.append_config_item("lxc.logfile", self.lxc_log_file)
+            self.container.append_config_item("lxc.logpriority", "3")
 
     def is_running(self):
         return self.container.running