Kodlama standartına uyalım commiti, harmless...

This commit is contained in:
S.Çağlar Onur
2005-06-16 13:09:23 +00:00
parent 76c801f099
commit 4f4efaf0b5
5 changed files with 21 additions and 21 deletions
+6 -6
View File
@@ -18,25 +18,25 @@ def files_name(name, version, release):
def is_recorded(name, version, release): def is_recorded(name, version, release):
key = (name, version, release) key = (name, version, release)
return d.has_key( key ) return d.has_key(key)
def is_installed(name, version, release): def is_installed(name, version, release):
key = (name, version, release) key = (name, version, release)
return is_recorded(key) and d[key]=='i' 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) key = (name, version, release)
if isInstalled(key): if isInstalled(key):
raise InstallDBError("already installed") raise InstallDBError("already installed")
d[key] = 'i' 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) key = (name, version, release)
d[key] = 'r' d[key] = 'r'
def purge( name, version, release): def purge(name, version, release):
util.remove_file( files_name( name, version, release) ) util.remove_file(files_name( name, version, release))
del d[key] del d[key]
+3 -3
View File
@@ -11,10 +11,10 @@ import bsddb.dbshelve as shelve
import util import util
import config import config
util.check_dir( config.db_dir() ) util.check_dir(config.db_dir())
d = shelve.open( config.db_dir() + '/package.bdb') d = shelve.open(config.db_dir() + '/package.bdb')
def add_package( name, package_info ): def add_package(name, package_info):
d[name] = package_info d[name] = package_info
def remove_package(name): def remove_package(name):
+3 -3
View File
@@ -8,10 +8,10 @@
import bsddb.dbshelve as shelve import bsddb.dbshelve as shelve
util.check_dir( config.db_dir() ) util.check_dir(config.db_dir())
d = shelve.open( config.db_dir() + '/source.bdb') d = shelve.open(config.db_dir() + '/source.bdb')
def add_source( name, source_info ): def add_source(name, source_info):
d[name] = source_info d[name] = source_info
def remove_source(name): def remove_source(name):
+1 -1
View File
@@ -66,7 +66,7 @@ class SpecFile(XmlFile):
self.source.archiveMD5 = getNodeAttribute(archiveNode, "md5sum") self.source.archiveMD5 = getNodeAttribute(archiveNode, "md5sum")
patchElts = self.getChildElts("Source/Patches") patchElts = self.getChildElts("Source/Patches")
if patchElts: 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") buildDepElts = self.getChildElts("Source/BuildDependencies")
if buildDepElts: if buildDepElts:
+8 -8
View File
@@ -40,19 +40,19 @@ def getChildElts(node):
def getNode(node, tagpath): def getNode(node, tagpath):
"""returns the *first* matching node for given tag path.""" """returns the *first* matching node for given tag path."""
tags=tagpath.split('/') tags = tagpath.split('/')
# iterative code to search for the path # iterative code to search for the path
# get DOM for top node # get DOM for top node
nodeList = node.getElementsByTagName(tags[0]) nodeList = node.getElementsByTagName(tags[0])
if len(nodeList)==0: if len(nodeList) == 0:
return None # not found return None # not found
node = nodeList[0] # discard other matches node = nodeList[0] # discard other matches
for tag in tags[1:]: for tag in tags[1:]:
nodeList = node.getElementsByTagName(tag) nodeList = node.getElementsByTagName(tag)
if len(nodeList)==0: if len(nodeList) == 0:
return None return None
else: else:
node = nodeList[0] node = nodeList[0]
@@ -62,11 +62,11 @@ def getNode(node, tagpath):
def getAllNodes(node, tags): def getAllNodes(node, tags):
"""retrieve all nodes that match a given tag path.""" """retrieve all nodes that match a given tag path."""
if len(tags)==0: if len(tags) == 0:
return [] return []
nodeList = node.getElementsByTagName(tags[0]) nodeList = node.getElementsByTagName(tags[0])
if len(nodeList)==0: if len(nodeList) == 0:
return [] return []
for tag in tags[1:]: for tag in tags[1:]:
@@ -76,7 +76,7 @@ def getAllNodes(node, tags):
nodeList.extend(x) nodeList.extend(x)
pass # emacs indentation error, keep it here pass # emacs indentation error, keep it here
if len(nodeList)==0: if len(nodeList) == 0:
return [] return []
return nodeList return nodeList
@@ -122,14 +122,14 @@ class XmlFile(object):
def getChildrenWithType(self, tagpath, type): def getChildrenWithType(self, tagpath, type):
""" returns the children of the given path, only with given type """ """ returns the children of the given path, only with given type """
node = self.getNode(tagpath) 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 # get only child elements
def getChildElts(self, tagpath): def getChildElts(self, tagpath):
""" returns the children of the given path, only with given type """ """ returns the children of the given path, only with given type """
node = self.getNode(tagpath) node = self.getNode(tagpath)
try: 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: except AttributeError:
return None return None