some small improvements
This commit is contained in:
+4
-4
@@ -16,16 +16,16 @@ try:
|
|||||||
from xmlextpiks import *
|
from xmlextpiks import *
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
gibidi
|
#if pisi.context.use_mdom:
|
||||||
if pisi.context.use_mdom:
|
# gibidi
|
||||||
raise Error('zibidi')
|
#else:
|
||||||
|
|
||||||
from xmlextcdom import *
|
from xmlextcdom import *
|
||||||
except:
|
except:
|
||||||
#raise Error('cannot find 4suite implementation')
|
#raise Error('cannot find 4suite implementation')
|
||||||
print 'xmlext: cDomlette/piksemel implementation cannot be loaded, falling back to minidom'
|
print 'xmlext: cDomlette/piksemel implementation cannot be loaded, falling back to minidom'
|
||||||
from xmlextmdom import *
|
from xmlextmdom import *
|
||||||
|
|
||||||
|
|
||||||
from xml.dom import XHTML_NAMESPACE, XML_NAMESPACE
|
from xml.dom import XHTML_NAMESPACE, XML_NAMESPACE
|
||||||
XHTML_NS = unicode(XHTML_NAMESPACE)
|
XHTML_NS = unicode(XHTML_NAMESPACE)
|
||||||
XML_NS = unicode(XML_NAMESPACE)
|
XML_NS = unicode(XML_NAMESPACE)
|
||||||
|
|||||||
@@ -18,13 +18,13 @@ try:
|
|||||||
#from xmlfilepiks import *
|
#from xmlfilepiks import *
|
||||||
except:
|
except:
|
||||||
try:
|
try:
|
||||||
zibidi
|
#if pisi.context.use_mdom:
|
||||||
if pisi.context.use_mdom:
|
# zibidi
|
||||||
raise Error('zibidi')
|
#else:
|
||||||
from xmlfilecdom import *
|
from xmlfilecdom import *
|
||||||
except:
|
except:
|
||||||
#raise Error('cannot find 4suite implementation')
|
#raise Error('cannot find 4suite implementation')
|
||||||
print 'xmlext: cDomlette/piksemel implementation cannot be loaded, falling back to minidom'
|
print 'xmlext: cDomlette/piksemel implementation cannot be loaded, falling back to minidom'
|
||||||
from xmlfilemdom import *
|
from xmlfilemdom import *
|
||||||
|
|
||||||
print 'gumburdop'
|
#print 'gumburdop'
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ from xml.parsers.expat import ExpatError
|
|||||||
import codecs
|
import codecs
|
||||||
|
|
||||||
import pisi
|
import pisi
|
||||||
from pisi.pxml.xmlextcdom import *
|
|
||||||
from pisi.file import File
|
from pisi.file import File
|
||||||
|
|
||||||
class Error(pisi.Error):
|
class Error(pisi.Error):
|
||||||
|
|||||||
@@ -4,12 +4,10 @@
|
|||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
|
|
||||||
sys.path.insert(0, '.')
|
sys.path.insert(0, '.')
|
||||||
|
|
||||||
import pisi.context as ctx
|
import pisi.context as ctx
|
||||||
ctx.usemdom = True
|
#ctx.usemdom = True
|
||||||
print 'hobarey'
|
|
||||||
import pisi
|
import pisi
|
||||||
import pisi.api
|
import pisi.api
|
||||||
import pisi.config
|
import pisi.config
|
||||||
@@ -35,26 +33,18 @@ for root, dirs, files in os.walk(repo_uri):
|
|||||||
sf.read(pisi.util.join_path(root, fn))
|
sf.read(pisi.util.join_path(root, fn))
|
||||||
sf.check()
|
sf.check()
|
||||||
print 'read %s: %s' % (sf.source.name, sf.source.version)
|
print 'read %s: %s' % (sf.source.name, sf.source.version)
|
||||||
|
|
||||||
specfiles.append(sf)
|
specfiles.append(sf)
|
||||||
|
|
||||||
#print specfiles
|
|
||||||
|
|
||||||
def plan_build(specfiles):
|
def plan_build(specfiles):
|
||||||
# try to construct a pisi graph of packages to
|
# try to construct a pisi graph of packages to
|
||||||
# install / reinstall
|
# install / reinstall
|
||||||
|
|
||||||
G_f = Digraph()
|
G_f = Digraph()
|
||||||
#pgraph.PGraph(packagedb) # construct G_f
|
|
||||||
|
|
||||||
pkgtosrc = {}
|
pkgtosrc = {}
|
||||||
|
|
||||||
for sf in specfiles:
|
for sf in specfiles:
|
||||||
for pkg in sf.packages:
|
for pkg in sf.packages:
|
||||||
pkgtosrc[str(pkg.name)] = str(sf.source.name)
|
pkgtosrc[str(pkg.name)] = str(sf.source.name)
|
||||||
|
|
||||||
# find the "install closure" graph of G_f by package
|
|
||||||
# set A using packagedb
|
|
||||||
for x in specfiles:
|
for x in specfiles:
|
||||||
#G_f.add_package(x)
|
#G_f.add_package(x)
|
||||||
src = x.source
|
src = x.source
|
||||||
|
|||||||
Reference in New Issue
Block a user