From 462ed49a74e2d8c512b85163d2cd2fafda4f4a09 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Thu, 22 Sep 2011 18:43:36 +0200
Subject: [PATCH] BUGFIX: TypeError: Can't convert 'list' object to str
implicitly (in emulator)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
bin/cdist | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/cdist b/bin/cdist
index 1f44ba2d..9a745251 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -688,8 +688,8 @@ def emulator():
param_fd.close()
if(param_old != param):
- print("Parameter differs: " + param_old + "vs," + param)
- print("Source = " + old_object_source + "new =" + object_source)
+ print("Parameter " + param + " differs: " + " ".join(param_old) + " vs. " + param)
+ print("Sources: " + " ".join(old_object_source) + " and " + object_source)
sys.exit(1)
else:
param_fd = open(file, "w")