sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

generate is starting to work

Browse Source 
git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@370 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
lxnay
2007-08-01 23:25:06 +00:00
parent 861def0535
commit 3c496d22c8
4 changed files with 72 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/equoTools.py
+57 -105
View File
@@ -878,9 +878,9 @@ def getNeededDependencies(packageInfo):
'''
@description: generates a dependency tree using unsatisfied dependencies
@input package: list of unsatisfied dependencies
@output: dependency tree dictionary
@output: dependency tree dictionary, if a dependency cannot be found,
it will be returned a dictionary with a -1 entry and the list of missing dependencies
'''
treecache = {}
def generateDependencyTree(unsatisfiedDeps):
treeview = {}
treedepth = 0
@@ -916,8 +916,16 @@ def generateDependencyTree(unsatisfiedDeps):
treeview[treedepth] = unsatisfiedDeps[:]
depsOk = False
if (dependenciesNotFound):
# Houston, we've got a problem
errorView = {}
errorView[-1] = dependenciesNotFound
return errorView
print treeview
dbconn.closeDB()
return treeview
'''
@@ -1046,11 +1054,9 @@ def database(options):
# FIXME: need SPEED and completion
if (options[0] == "generate"):
#import threading
print_warning(bold("####### ATTENTION -> ")+red("The installed package database will be regenerated, this will take a LOT of time."))
print_warning(bold("####### ATTENTION -> ")+red("Sabayon Linux Officially Repository MUST be on top of the repositories list in ")+etpConst['repositoriesconf'])
print_warning(bold("####### ATTENTION -> ")+red("This method is only used for testing at the moment."))
print_warning(bold("####### ATTENTION -> ")+red("This method is only used for testing at the moment and you need Portage installed. Don't worry about Portage warnings."))
rc = askquestion(" Can I continue ?")
if rc == "No":
sys.exit(0)
@@ -1074,107 +1080,42 @@ def database(options):
clientDbconn.initializeDatabase()
print_info(darkgreen(" Database reinitialized correctly at "+bold(etpConst['etpdatabaseclientfilepath'])))
# now collect files in the system
tmpfile = etpConst['packagestmpfile']+".diskanalyze"
print_info(red(" Collecting installed files... Saving into ")+bold(tmpfile))
# now collect packages in the system
from portageTools import getInstalledPackages as _portage_getInstalledPackages
print_info(red(" Collecting installed packages..."))
f = open(tmpfile,"w")
for dir in etpConst['filesystemdirs']:
if os.path.isdir(dir):
for dir,subdirs,files in os.walk(dir):
print_info(darkgreen(" Analyzing directory "+bold(dir[:50]+"...")),back = True)
for file in files:
file = dir+"/"+file
f.write(file+"\n")
f.flush()
f.close()
f = open(tmpfile,"r")
systemFiles = []
for x in f.readlines():
systemFiles.append(x.strip())
f.close()
orphanedFiles = []
foundPackages = []
portagePackages = _portage_getInstalledPackages()
portagePackages = portagePackages[0]
print_info(red(" Now analyzing database content..."))
foundPackages = []
# do for each database
repocount = 0
for repo in etpRepositories:
repocount += 1
print_info("("+blue(str(repocount))+"/"+darkblue(str(len(etpRepositories)))+") "+red(" Analyzing ")+bold(etpRepositories[repo]['description'])+"...", back = True)
# sync if needed
rc = fetchRepositoryIfNotAvailable(repo)
if (rc != 0):
return 129
dbfile = etpRepositories[repo]['dbpath']+"/"+etpConst['etpdatabasefile']
if (not orphanedFiles): # first cycle
missingPackages = portagePackages[:]
for portagePackage in portagePackages: # for portagePackage in remainingPackages
print_info(red(" Analyzing ")+bold(portagePackage), back = True)
# open database
dbRepo = etpDatabase(readOnly = True, noUpload = True, dbFile = dbfile)
# FIXME: add branch support
# search into database
cnt = 0
totalcnt = len(systemFiles)
data = atomMatch(portagePackage)
if (data[0] != -1):
foundPackages.append(data)
missingPackages.remove(portagePackage)
for file in systemFiles:
cnt += 1
print_info(" @@ "+red("(")+blue(str(cnt))+"/"+bold(str(totalcnt))+red(")")+red(" Analyzing files..."), back = True)
pkgids = dbRepo.getIDPackagesFromFile(file)
if (pkgids):
for pkg in pkgids:
try:
foundPackages.index(int(pkg))
# nothing to do
except:
# FIXME: if we get here, we need to analyze branch and then add
foundPackages.append([repo,pkg])
else:
orphanedFiles.append(file)
print_info(red(" @@ Completed."))
dbRepo.closeDB()
else:
dbRepo = etpDatabase(readOnly = True, noUpload = True, dbFile = dbfile)
_orphanedFiles = orphanedFiles
orphanedFiles = []
print_info(red(" ### Packages matching: ")+bold(str(len(foundPackages))))
print_info(red(" ### Packages not matching: ")+bold(str(len(missingPackages))))
f = open("/tmp/notmatch","w")
for x in missingPackages:
f.write(str(x)+"\n")
f.flush()
f.close()
f = open("/tmp/match","w")
for x in foundPackages:
f.write(str(x)+"\n")
f.flush()
f.close()
cnt = 0
totalcnt = len(_orphanedFiles)
for file in _orphanedFiles:
cnt += 1
print_info(" @@ "+red("(")+blue(str(cnt))+"/"+bold(str(totalcnt))+red(")")+red(" Analyzing files..."), back = True)
pkgids = dbRepo.getIDPackagesFromFile(file)
if (pkgids):
for pkg in pkgids:
try:
foundPackages.index(int(pkg))
# nothing to do
except:
# FIXME: if we get here, we need to analyze branch and then add
foundPackages.append([repo,pkg])
else:
orphanedFiles.append(file)
print_info(red(" @@ Completed."))
dbRepo.closeDB()
print_info(red(" ### Orphaned files:")+bold(str(len(orphanedFiles))))
foundPackages = list(set(foundPackages))
print_info(red(" ### Packages matching:")+bold(str(len(foundPackages))))
if os.path.isfile(tmpfile):
os.remove(tmpfile)
clientDbconn.closeDB()
@@ -1240,18 +1181,21 @@ def printPackageInfo(idpackage,dbconn):
print_info(darkgreen(" License:\t\t")+red(pkglic))
def searchPackage(packages):
def searchPackage(packages, idreturn = False):
foundPackages = {}
print_info(yellow(" @@ ")+darkgreen("Searching..."))
if (not idreturn):
print_info(yellow(" @@ ")+darkgreen("Searching..."))
# search inside each available database
repoNumber = 0
searchError = False
for repo in etpRepositories:
foundPackages[repo] = {}
repoNumber += 1
print_info(blue(" #"+str(repoNumber))+bold(" "+etpRepositories[repo]['description']))
if (not idreturn):
print_info(blue(" #"+str(repoNumber))+bold(" "+etpRepositories[repo]['description']))
rc = fetchRepositoryIfNotAvailable(repo)
if (rc != 0):
@@ -1261,14 +1205,16 @@ def searchPackage(packages):
dbfile = etpRepositories[reponame]['dbpath']+"/"+etpConst['etpdatabasefile']
dbconn = etpDatabase(readOnly = True, dbFile = dbfile)
dataInfo = [] # when idreturn is True
for package in packages:
result = dbconn.searchPackages(package)
if (result):
foundPackages[repo][package] = result
# print info
print_info(blue(" Keyword: ")+bold("\t"+package))
print_info(blue(" Found: ")+bold("\t"+str(len(foundPackages[repo][package])))+red(" entries"))
if (not idreturn):
print_info(blue(" Keyword: ")+bold("\t"+package))
print_info(blue(" Found: ")+bold("\t"+str(len(foundPackages[repo][package])))+red(" entries"))
for pkg in foundPackages[repo][package]:
idpackage = pkg[1]
atom = pkg[0]
@@ -1281,10 +1227,16 @@ def searchPackage(packages):
if foundBranchIndex > myBranchIndex:
# package found in branch more unstable than the selected one, for us, it does not exist
continue
printPackageInfo(idpackage,dbconn)
if (idreturn):
dataInfo.append([idpackage,repo])
else:
printPackageInfo(idpackage,dbconn)
dbconn.closeDB()
if (idreturn):
return dataInfo
if searchError:
print_warning(yellow(" @@ ")+red("Something bad happened. Please have a look."))
return 129
libraries/entropyConstants.py
+1
View File
@@ -86,6 +86,7 @@ DROP TABLE IF EXISTS keywordsreference;
DROP TABLE IF EXISTS categories;
DROP TABLE IF EXISTS licenses;
DROP TABLE IF EXISTS flags;
DROP TABLE IF EXISTS installedtable;
"""
etpSQLInit = """
libraries/remoteTools.py
+1 -1
View File
@@ -127,7 +127,7 @@ def __downloadFileCommitData(f, buf, output = True, maxsize = 0):
bartext += "]"
average = str(average)
if len(average) < 2:
average = "0"+average
average = " "+average
currentText += "\t\t"+average+"% "+bartext
# print !
print_info(currentText,back = True)
libraries/serverConstants.py
+13 -16
View File
@@ -27,6 +27,7 @@ import random
import sys
from entropyConstants import *
if (commands.getoutput("q -V").find("portage-utils") != -1):
pFindLibrary = "qfile -qC "
pFindLibraryXT = "qfile -qeC "
@@ -97,17 +98,17 @@ nocheck : yes
f.close()
# fill etpConst['overlays']
ovlst = os.listdir(etpConst['overlaysdir'])
_ovlst = []
for i in ovlst:
if os.path.isdir(etpConst['overlaysdir']+"/"+i):
_ovlst.append(etpConst['overlaysdir']+"/"+i)
etpConst['overlays'] = string.join(_ovlst," ")
if os.path.isdir(etpConst['overlaysdir']):
ovlst = os.listdir(etpConst['overlaysdir'])
_ovlst = []
for i in ovlst:
if os.path.isdir(etpConst['overlaysdir']+"/"+i):
_ovlst.append(etpConst['overlaysdir']+"/"+i)
etpConst['overlays'] = string.join(_ovlst," ")
# activator section
if (not os.path.isfile(etpConst['activatorconf'])):
print "ERROR: "+etpConst['activatorconf']+" does not exist"
sys.exit(50)
print "CRITICAL WARNING!!! "+etpConst['activatorconf']+" does not exist"
else:
try:
if (os.stat(etpConst['activatorconf'])[0] != 33152):
@@ -147,8 +148,7 @@ else:
# enzyme section
if (not os.path.isfile(etpConst['enzymeconf'])):
print "ERROR: "+etpConst['enzymeconf']+" does not exist"
sys.exit(50)
print "CRITICAL WARNING!!! "+etpConst['enzymeconf']+" does not exist"
else:
f = open(etpConst['enzymeconf'],"r")
enzymeconf = f.readlines()
@@ -173,8 +173,7 @@ else:
# reagent section
if (not os.path.isfile(etpConst['reagentconf'])):
print "ERROR: "+etpConst['reagentconf']+" does not exist"
sys.exit(50)
print "CRITICAL WARNING!!! "+etpConst['reagentconf']+" does not exist"
else:
f = open(etpConst['reagentconf'],"r")
reagentconf = f.readlines()
@@ -196,8 +195,7 @@ else:
# mirrors section
if (not os.path.isfile(etpConst['mirrorsconf'])):
print "ERROR: "+etpConst['mirrorsconf']+" does not exist"
sys.exit(50)
print "CRITICAL WARNING!!! "+etpConst['mirrorsconf']+" does not exist"
else:
f = open(etpConst['mirrorsconf'],"r")
databaseconf = f.readlines()
@@ -219,8 +217,7 @@ else:
# spmbackend section
if (not os.path.isfile(etpConst['spmbackendconf'])):
print "ERROR: "+etpConst['spmbackendconf']+" does not exist"
sys.exit(50)
print "CRITICAL WARNING!!! "+etpConst['spmbackendconf']+" does not exist"
else:
f = open(etpConst['spmbackendconf'],"r")
spmconf = f.readlines()