From b55cdfb04556cf7e3af9c8c57f3680f2a9e86774 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20de=20Saint=20Martin?= Date: Tue, 10 Sep 2013 14:36:05 +0000 Subject: [PATCH] slapconfiguration: don't encode tap (which is actually a set) to str. Fixes 29da1c7530e390e552832d8cf40ac6a757dd3ab5. --- slapos/recipe/slapconfiguration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slapos/recipe/slapconfiguration.py b/slapos/recipe/slapconfiguration.py index f4659b6..4504d2f 100644 --- a/slapos/recipe/slapconfiguration.py +++ b/slapos/recipe/slapconfiguration.py @@ -137,7 +137,7 @@ class Recipe(object): if ipv6_set: options['ipv6-random'] = list(ipv6_set)[0].encode('UTF-8') - options['tap'] = tap_set.encode('UTF-8') + options['tap'] = tap_set parameter_dict = self._expandParameterDict(options, parameter_dict) match = self.OPTCRE_match for key, value in parameter_dict.iteritems(): -- 2.1.4