From e871a70907d8314e6aabfaa4b6255deb37b95db8 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Mon, 3 Mar 2008 19:29:17 +0000
Subject: [PATCH] fix mergeFrom

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

diff --git a/libraries/entropy.py b/libraries/entropy.py
index 38cfd0499..e4b09ea66 100644
--- a/libraries/entropy.py
+++ b/libraries/entropy.py
@@ -2874,7 +2874,7 @@ class PackageInterface:
             imageDir = imageDir.encode('raw_unicode_escape')
         # XXX Python 2.4 workaround
 
-        if mergeFrom:
+        if self.infoDict['merge_from']:
             self.Entropy.entropyTools.spawnFunction(
                         self.__fill_image_dir,
                         self.infoDict['merge_from'],
@@ -3499,7 +3499,6 @@ class PackageInterface:
                 portdbdir = os.path.join(self.infoDict['merge_from'],portdbdir)
                 portdbdir = os.path.join(portdbdir,self.infoDict['category'])
                 portdbdir = os.path.join(portdbdir,self.infoDict['name']+"-"+self.infoDict['version'])
-                print "DEBUG: portdbdir",portdbdir
                 self.infoDict['xpakdir'] = portdbdir
 
         # compare both versions and if they match, disable removeidpackage