fix mergeFrom

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1374 cd1c1023-2f26-0410-ae45-c471fc1f0318
2008-03-03 19:29:17 +00:00
parent 6485ff5667
commit e871a70907
1 changed files with 1 additions and 2 deletions
@@ -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