From 537684bb8cf115b13cb711d932cb862aa4cc3fc2 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Mon, 3 Mar 2008 22:20:22 +0000
Subject: [PATCH] merge_from must be unicoded

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1381 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 libraries/entropy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/entropy.py b/libraries/entropy.py
index 35964f683..ba33b7e7c 100644
--- a/libraries/entropy.py
+++ b/libraries/entropy.py
@@ -3469,7 +3469,7 @@ class PackageInterface:
         self.infoDict['merge_from'] = None
         mf = self.metaopts.get('merge_from')
         if mf != None:
-            self.infoDict['merge_from'] = mf
+            self.infoDict['merge_from'] = unicode(mf)
         self.infoDict['removeconfig'] = removeConfig
         self.infoDict['removeidpackage'] = self.Entropy.retrieveInstalledIdPackage(
                                                 self.Entropy.entropyTools.dep_getkey(self.infoDict['atom']),