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

- updated TODO

Browse Source 
- inaugurate a new small reagent tool to help spm tree compilation

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1096 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
(no author)
2008-01-24 18:31:40 +00:00
parent 8117cdad84
commit cb14ddf992
5 changed files with 172 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@@ -1,5 +1,5 @@
TODO list:
- check downgrades (*)
- complete reagent spm interface
- migrate server code to ServerInterface
- Community repositories
- find a way to better handle real smartapps deps (need split PDEPEND?)

6
libraries/entropyConstants.py
View File

@@ -639,6 +639,12 @@ def initConfig_entropyConstants(rootdir):
'systemroot': rootdir, # default system root
'uid': os.getuid(), # current running UID
'treeupdatescalled': False, # to avoid running tree updates functions multiple times
'spm': {
'exec': "/usr/bin/emerge", # source package manager executable
'ask_cmd': "--ask",
'pretend_cmd': "--pretend",
'verbose_cmd': "--verbose"
},
'dumpstoragedir': ETP_DIR+ETP_CACHESDIR, # data storage directory, useful to speed up equo across multiple issued commands

215
libraries/portageTools.py
View File

@@ -78,20 +78,16 @@ def getConfigProtectAndMask():
# resolve atoms automagically (best, not current!)
# sys-libs/application --> sys-libs/application-1.2.3-r1
def getBestAtom(atom):
import gc
def getBestAtom(atom, match = "bestmatch-visible"):
try:
rc = portage.portdb.xmatch("bestmatch-visible",str(atom))
gc.collect() # XXX: temp workaround for a python bug with portage
rc = portage.portdb.xmatch(match,str(atom))
return rc
except ValueError:
return "!!conflicts"
# same as above but includes masked ebuilds
def getBestMaskedAtom(atom):
import gc
atoms = portage.portdb.xmatch("match-all",str(atom))
gc.collect() # XXX: temp workaround for a python bug with portage
# find the best
from portage_versions import best
rc = best(atoms)
@@ -99,10 +95,8 @@ def getBestMaskedAtom(atom):
# should be only used when a pkgcat/pkgname <-- is not specified (example: db, amarok, AND NOT media-sound/amarok)
def getAtomCategory(atom):
import gc
try:
rc = portage.portdb.xmatch("match-all",str(atom))[0].split("/")[0]
gc.collect() # XXX: temp workaround for a python bug with portage
return rc
except:
return None
@@ -312,103 +306,103 @@ def synthetizeRoughDependencies(roughDependencies, useflags = None):
dependencies = ""
conflicts = ""
useflags = useflags.split()
length = len(roughDependencies)
atomcount = -1
while atomcount < length:
atomcount += 1
try:
atom = roughDependencies[atomcount]
except:
break
if atom.startswith("("):
if (openOr):
openParenthesisFromOr += 1
openParenthesis += 1
curparenthesis = openParenthesis # 2
if (useFlagQuestion) and (not useMatch):
skip = True
while (skip):
atomcount += 1
atom = roughDependencies[atomcount]
if atom.startswith("("):
curparenthesis += 1
elif atom.startswith(")"):
if (curparenthesis == openParenthesis):
skip = False
curparenthesis -= 1
useFlagQuestion = False
elif atom.endswith("?"):
#if (useFlagQuestion) and (not useMatch): # if we're already in a question and the question is not accepted, skip the cycle
# continue
# we need to see if that useflag is enabled
useFlag = atom.split("?")[0]
useFlagQuestion = True # V
#openParenthesisFromLastUseFlagQuestion = 0
if useFlag.startswith("!"):
checkFlag = useFlag[1:]
try:
useflags.index(checkFlag)
useMatch = False
except:
useMatch = True
else:
try:
useflags.index(useFlag)
useMatch = True # V
except:
useMatch = False
atomcount += 1
try:
atom = roughDependencies[atomcount]
except:
break
if atom.startswith("("):
if (openOr):
openParenthesisFromOr += 1
openParenthesis += 1
curparenthesis = openParenthesis # 2
if (useFlagQuestion) and (not useMatch):
skip = True
while (skip):
atomcount += 1
atom = roughDependencies[atomcount]
if atom.startswith("("):
curparenthesis += 1
elif atom.startswith(")"):
if (curparenthesis == openParenthesis):
skip = False
curparenthesis -= 1
useFlagQuestion = False
elif atom.endswith("?"):
#if (useFlagQuestion) and (not useMatch): # if we're already in a question and the question is not accepted, skip the cycle
# continue
# we need to see if that useflag is enabled
useFlag = atom.split("?")[0]
useFlagQuestion = True # V
#openParenthesisFromLastUseFlagQuestion = 0
if useFlag.startswith("!"):
checkFlag = useFlag[1:]
try:
useflags.index(checkFlag)
useMatch = False
except:
useMatch = True
else:
try:
useflags.index(useFlag)
useMatch = True # V
except:
useMatch = False
elif atom.startswith(")"):
openParenthesis -= 1
if (openParenthesis == 0):
useFlagQuestion = False
useMatch = False
if (openOr):
# remove last "_or_" from dependencies
if (openParenthesisFromOr == 1):
openOr = False
if dependencies.endswith(dbOR):
dependencies = dependencies[:len(dependencies)-len(dbOR)]
dependencies += " "
elif (openParenthesisFromOr == 2):
if dependencies.endswith("|and|"):
dependencies = dependencies[:len(dependencies)-len("|and|")]
dependencies += dbOR
openParenthesisFromOr -= 1
openParenthesis -= 1
if (openParenthesis == 0):
useFlagQuestion = False
useMatch = False
if (openOr):
# remove last "_or_" from dependencies
if (openParenthesisFromOr == 1):
openOr = False
if dependencies.endswith(dbOR):
dependencies = dependencies[:len(dependencies)-len(dbOR)]
dependencies += " "
elif (openParenthesisFromOr == 2):
if dependencies.endswith("|and|"):
dependencies = dependencies[:len(dependencies)-len("|and|")]
dependencies += dbOR
openParenthesisFromOr -= 1
elif atom.startswith("||"):
openOr = True # V
elif (atom.find("/") != -1) and (not atom.startswith("!")) and (not atom.endswith("?")):
# it's a package name <pkgcat>/<pkgname>-???
if (useFlagQuestion == useMatch):
# check if there's an OR
if (openOr):
dependencies += atom
# check if the or is fucked up
if openParenthesisFromOr > 1:
dependencies += "|and|" # !!
else:
dependencies += dbOR
openOr = True # V
elif (atom.find("/") != -1) and (not atom.startswith("!")) and (not atom.endswith("?")):
# it's a package name <pkgcat>/<pkgname>-???
if (useFlagQuestion == useMatch):
# check if there's an OR
if (openOr):
dependencies += atom
# check if the or is fucked up
if openParenthesisFromOr > 1:
dependencies += "|and|" # !!
else:
dependencies += dbOR
else:
dependencies += atom
dependencies += " "
dependencies += atom
dependencies += " "
elif atom.startswith("!") and (not atom.endswith("?")):
if ((useFlagQuestion) and (useMatch)) or ((not useFlagQuestion) and (not useMatch)):
conflicts += atom
if (openOr):
conflicts += dbOR
if ((useFlagQuestion) and (useMatch)) or ((not useFlagQuestion) and (not useMatch)):
conflicts += atom
if (openOr):
conflicts += dbOR
else:
conflicts += " "
conflicts += " "
# format properly
@@ -469,6 +463,41 @@ def getPortageAppDbPath():
return rc+"/"
return rc
def getAvailablePackages(categories = [], filter_reinstalls = True):
import portage_const
mypath = etpConst['systemroot']+"/"
mysettings = portage.config(config_root="/", target_root=mypath, config_incrementals=portage_const.INCREMENTALS)
portdb = portage.portdbapi(mysettings["PORTDIR"], mysettings = mysettings)
cps = portdb.cp_all()
visibles = set()
for cp in cps:
if categories and cp.split("/")[0] not in categories:
continue
# get slots
slots = set()
atoms = getBestAtom(cp, "match-visible")
for atom in atoms:
slots.add(portdb.aux_get(atom, ["SLOT"])[0])
for slot in slots:
visibles.add(cp+":"+slot)
del cps
# now match visibles
available = set()
for visible in visibles:
match = getBestAtom(visible)
if filter_reinstalls:
installed = getInstalledAtom(visible)
# if not installed, installed == None
if installed != match:
available.add(match)
else:
available.add(match)
del visibles
return available
# Collect installed packages
def getInstalledPackages(dbdir = None):
if not dbdir:

33
libraries/reagentTools.py
View File

@@ -1082,3 +1082,36 @@ def database(options):
dbconn.closeDB()
return rc
def spm(options):
if len(options) < 2:
return 0
import portageTools
options = options[1:]
opts = []
do_list = False
for opt in options:
if opt == "--list":
do_list = True
else:
opts.append(opt)
options = opts[:]
del opts
action = options[0]
if action == "categories":
if len(options) < 2:
return 0
categories = list(set(options[1:]))
categories.sort()
packages = portageTools.getAvailablePackages(categories)
packages = list(packages)
packages.sort()
if do_list:
print ' '.join(["="+x for x in packages])
else:
os.system(etpConst['spm']['exec']+" "+etpConst['spm']['ask_cmd']+" "+etpConst['spm']['verbose_cmd']+" "+" ".join(["="+x for x in packages]))

10
server/reagent
View File

@@ -74,6 +74,11 @@ def print_help():
print_info(" \t\t"+green("md5check")+"\t\t\t Check digest of a package, a list of packages, world")
print_info(" \t\t"+green("md5remote")+"\t\t\t Compare digest of a package between database and mirrors")
print_info(" \t"+green("spm")+brown("\t\t Source Package Manager tool manager"))
print_info(" \t\t"+green("compile")+"\t\t\t Start SPM and compile something")
print_info(" \t\t\t"+red("categories")+"\t compile provided categories")
print_info(" \t\t\t"+brown("--list")+"\t\t list packages and quit")
print_info(" \t"+green("deptest")+brown("\t\t Look for unsatisfied dependencies inside database"))
print_info(" \t"+green("depends")+brown("\t\t Regenerate depends table (plus database lock and bump)"))
print_info(" \t\t"+red("--quiet")+"\t\t\t\t just print the dependencies list")
@@ -150,3 +155,8 @@ elif (options[0] == "depends"):
elif (options[0] == "cleanup"):
rc = entropyTools.cleanup()
exit(rc)
# deptest tool
elif (options[0] == "spm"):
rc = reagentTools.spm(options[1:])
exit(rc)