merge_from must be unicoded
git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1381 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
@@ -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']),
|
||||
|
||||
Reference in New Issue
Block a user