From: Stéphane Graber <stgraber@ubuntu.com>
Date: Sun, 25 May 2014 12:36:28 +0000 (+0200)
Subject: python3: Don't require a template name
X-Git-Tag: lxc-1.1.0.alpha1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8df68465f2e0425079aec7a4831acb8c04a97ae7;p=thirdparty%2Flxc.git

python3: Don't require a template name

The template name isn't required, if it's not passed, then create will
simply be asked to create a container without a rootfs.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/python-lxc/lxc.c b/src/python-lxc/lxc.c
index f7ab09222..d436c2846 100644
--- a/src/python-lxc/lxc.c
+++ b/src/python-lxc/lxc.c
@@ -733,7 +733,7 @@ Container_create(Container *self, PyObject *args, PyObject *kwds)
     int i = 0;
     static char *kwlist[] = {"template", "flags", "args", NULL};
 
-    if (! PyArg_ParseTupleAndKeywords(args, kwds, "s|iO", kwlist,
+    if (! PyArg_ParseTupleAndKeywords(args, kwds, "|siO", kwlist,
                                       &template_name, &flags, &vargs))
         return NULL;
 
diff --git a/src/python-lxc/lxc/__init__.py b/src/python-lxc/lxc/__init__.py
index 45d139d71..47b25b8e4 100644
--- a/src/python-lxc/lxc/__init__.py
+++ b/src/python-lxc/lxc/__init__.py
@@ -201,11 +201,11 @@ class Container(_lxc.Container):
 
         return _lxc.Container.set_config_item(self, key, value)
 
-    def create(self, template, flags=0, args=()):
+    def create(self, template=None, flags=0, args=()):
         """
             Create a new rootfs for the container.
 
-            "template" must be a valid template name.
+            "template" if passed must be a valid template name.
 
             "flags" (optional) is an integer representing the optional
             create flags to be passed.
@@ -222,8 +222,13 @@ class Container(_lxc.Container):
         else:
             template_args = args
 
-        return _lxc.Container.create(self, template=template,
-                                     flags=flags, args=tuple(template_args))
+        if template:
+            return _lxc.Container.create(self, template=template,
+                                         flags=flags,
+                                         args=tuple(template_args))
+        else:
+            return _lxc.Container.create(self, flags=flags,
+                                         args=tuple(template_args))
 
     def clone(self, newname, config_path=None, flags=0, bdevtype=None,
               bdevdata=None, newsize=0, hookargs=()):