X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;fp=daklib%2Fdbconn.py;h=973fa797552fe3ae86025e4ccff7d9e31248743a;hb=bb5af8d977c37a187eaa1661bfc9f0f2512a0745;hp=a599e5c1cf1c96fb63498f19e2ff55cb77677666;hpb=ff9a1a665927c55c1bbda660ea4b6e085a0072db;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index a599e5c1..973fa797 100644 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -691,6 +691,16 @@ def get_component(component, session=None): __all__.append('get_component') +def get_mapped_component_name(component_name): + cnf = Config() + for m in cnf.value_list("ComponentMappings"): + (src, dst) = m.split() + if component_name == src: + component_name = dst + return component_name + +__all__.append('get_mapped_component_name') + @session_wrapper def get_mapped_component(component_name, session=None): """get component after mappings @@ -709,11 +719,7 @@ def get_mapped_component(component_name, session=None): @rtype: L{daklib.dbconn.Component} or C{None} @return: component after applying maps or C{None} """ - cnf = Config() - for m in cnf.value_list("ComponentMappings"): - (src, dst) = m.split() - if component_name == src: - component_name = dst + component_name = get_mapped_component_name(component_name) component = session.query(Component).filter_by(component_name=component_name).first() return component