core: owner_fallback(): rework to be consistent with other functions.

This commit is contained in:
Jimmy Berry 2017-06-22 23:12:45 -05:00
parent 4bc130a927
commit d4bea1f28d

View File

@ -1,21 +1,20 @@
from xml.etree import cElementTree as ET from xml.etree import cElementTree as ET
import osc.core
from osc.core import get_dependson from osc.core import get_dependson
from osc.core import http_GET from osc.core import http_GET
from osc.core import makeurl from osc.core import makeurl
from osc.core import owner
from osc.core import show_project_meta from osc.core import show_project_meta
from osclib.memoize import memoize from osclib.memoize import memoize
@memoize(session=True) @memoize(session=True)
def owner_fallback(apiurl, project, package): def owner_fallback(apiurl, project, package):
root = osc.core.owner(apiurl, package, project=project) root = owner(apiurl, package, project=project)
owner = root.find('owner') entry = root.find('owner')
if not owner or owner.get('project') == project: if not entry or entry.get('project') == project:
# Fallback to global (ex Factory) maintainer. # Fallback to global (ex Factory) maintainer.
root = osc.core.owner(apiurl, package) root = owner(apiurl, package)
return root return root
@memoize(session=True) @memoize(session=True)