Kodlama standartına uyalım commiti, harmless...
This commit is contained in:
@@ -18,25 +18,25 @@ def files_name(name, version, release):
|
||||
|
||||
def is_recorded(name, version, release):
|
||||
key = (name, version, release)
|
||||
return d.has_key( key )
|
||||
return d.has_key(key)
|
||||
|
||||
def is_installed(name, version, release):
|
||||
key = (name, version, release)
|
||||
return is_recorded(key) and d[key]=='i'
|
||||
|
||||
def install( name, version, release, files_xml):
|
||||
def install(name, version, release, files_xml):
|
||||
key = (name, version, release)
|
||||
if isInstalled(key):
|
||||
raise InstallDBError("already installed")
|
||||
d[key] = 'i'
|
||||
util.copy_file(files_xml, files_name( name, version, release) )
|
||||
util.copy_file(files_xml, files_name(name, version, release))
|
||||
|
||||
def remove( name, version, release):
|
||||
def remove(name, version, release):
|
||||
key = (name, version, release)
|
||||
d[key] = 'r'
|
||||
|
||||
def purge( name, version, release):
|
||||
util.remove_file( files_name( name, version, release) )
|
||||
def purge(name, version, release):
|
||||
util.remove_file(files_name( name, version, release))
|
||||
del d[key]
|
||||
|
||||
|
||||
|
||||
@@ -11,10 +11,10 @@ import bsddb.dbshelve as shelve
|
||||
import util
|
||||
import config
|
||||
|
||||
util.check_dir( config.db_dir() )
|
||||
d = shelve.open( config.db_dir() + '/package.bdb')
|
||||
util.check_dir(config.db_dir())
|
||||
d = shelve.open(config.db_dir() + '/package.bdb')
|
||||
|
||||
def add_package( name, package_info ):
|
||||
def add_package(name, package_info):
|
||||
d[name] = package_info
|
||||
|
||||
def remove_package(name):
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
|
||||
import bsddb.dbshelve as shelve
|
||||
|
||||
util.check_dir( config.db_dir() )
|
||||
d = shelve.open( config.db_dir() + '/source.bdb')
|
||||
util.check_dir(config.db_dir())
|
||||
d = shelve.open(config.db_dir() + '/source.bdb')
|
||||
|
||||
def add_source( name, source_info ):
|
||||
def add_source(name, source_info):
|
||||
d[name] = source_info
|
||||
|
||||
def remove_source(name):
|
||||
|
||||
@@ -66,7 +66,7 @@ class SpecFile(XmlFile):
|
||||
self.source.archiveMD5 = getNodeAttribute(archiveNode, "md5sum")
|
||||
patchElts = self.getChildElts("Source/Patches")
|
||||
if patchElts:
|
||||
self.source.patches = [ PatchInfo(p) for p in patchElts ]
|
||||
self.source.patches = [PatchInfo(p) for p in patchElts]
|
||||
|
||||
buildDepElts = self.getChildElts("Source/BuildDependencies")
|
||||
if buildDepElts:
|
||||
|
||||
+8
-8
@@ -40,19 +40,19 @@ def getChildElts(node):
|
||||
def getNode(node, tagpath):
|
||||
"""returns the *first* matching node for given tag path."""
|
||||
|
||||
tags=tagpath.split('/')
|
||||
tags = tagpath.split('/')
|
||||
|
||||
# iterative code to search for the path
|
||||
|
||||
# get DOM for top node
|
||||
nodeList = node.getElementsByTagName(tags[0])
|
||||
if len(nodeList)==0:
|
||||
if len(nodeList) == 0:
|
||||
return None # not found
|
||||
|
||||
node = nodeList[0] # discard other matches
|
||||
for tag in tags[1:]:
|
||||
nodeList = node.getElementsByTagName(tag)
|
||||
if len(nodeList)==0:
|
||||
if len(nodeList) == 0:
|
||||
return None
|
||||
else:
|
||||
node = nodeList[0]
|
||||
@@ -62,11 +62,11 @@ def getNode(node, tagpath):
|
||||
def getAllNodes(node, tags):
|
||||
"""retrieve all nodes that match a given tag path."""
|
||||
|
||||
if len(tags)==0:
|
||||
if len(tags) == 0:
|
||||
return []
|
||||
|
||||
nodeList = node.getElementsByTagName(tags[0])
|
||||
if len(nodeList)==0:
|
||||
if len(nodeList) == 0:
|
||||
return []
|
||||
|
||||
for tag in tags[1:]:
|
||||
@@ -76,7 +76,7 @@ def getAllNodes(node, tags):
|
||||
nodeList.extend(x)
|
||||
pass # emacs indentation error, keep it here
|
||||
|
||||
if len(nodeList)==0:
|
||||
if len(nodeList) == 0:
|
||||
return []
|
||||
|
||||
return nodeList
|
||||
@@ -122,14 +122,14 @@ class XmlFile(object):
|
||||
def getChildrenWithType(self, tagpath, type):
|
||||
""" returns the children of the given path, only with given type """
|
||||
node = self.getNode(tagpath)
|
||||
return filter(lambda x:x.nodeType==type, node.childNodes)
|
||||
return filter(lambda x:x.nodeType == type, node.childNodes)
|
||||
|
||||
# get only child elements
|
||||
def getChildElts(self, tagpath):
|
||||
""" returns the children of the given path, only with given type """
|
||||
node = self.getNode(tagpath)
|
||||
try:
|
||||
return filter(lambda x:x.nodeType==x.ELEMENT_NODE, node.childNodes)
|
||||
return filter(lambda x:x.nodeType == x.ELEMENT_NODE, node.childNodes)
|
||||
except AttributeError:
|
||||
return None
|
||||
|
||||
|
||||
Reference in New Issue
Block a user