From fdfb4252b7918b7a08593aeb85db9a3f373a4e53 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Tue, 11 Dec 2007 23:21:04 +0000 Subject: [PATCH] typo in function call git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@844 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/entropyTools.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/entropyTools.py b/libraries/entropyTools.py index 879bb628f..a05998eba 100644 --- a/libraries/entropyTools.py +++ b/libraries/entropyTools.py @@ -1297,7 +1297,7 @@ def writeNewBranch(branch): # @pkgdata: etpData mapping dictionary (retrieved from db using getPackageData()) # @dirpath: directory to save .tbz2 -def quickpkg(pkgdata,dirpath, edb = True): +def quickpkg(pkgdata,dirpath, edb = True, portdbPath = None): entropyLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"quickpkg: called -> "+str(pkgdata)+" | dirpath: "+dirpath) import stat @@ -1353,8 +1353,14 @@ def quickpkg(pkgdata,dirpath, edb = True): # appending xpak metadata if etpConst['gentoo-compat']: import etpXpak - from portageTools import getPortageAppDbPath - dbdir = getPortageAppDbPath()+"/"+pkgcat+"/"+pkgname+"/" + + gentoo_name = remove_tag(pkgname) + gentoo_name = remove_entropy_revision(gentoo_name) + if portdbPath == None: + from portageTools import getPortageAppDbPath + dbdir = getPortageAppDbPath()+"/"+pkgcat+"/"+gentoo_name+"/" + else: + dbdir = portdbPath+"/"+pkgcat+"/"+gentoo_name+"/" if os.path.isdir(dbdir): tbz2 = etpXpak.tbz2(dirpath) tbz2.recompose(dbdir)