From 82d23ff08d7010663b7e404a95a08897523ee8c5 Mon Sep 17 00:00:00 2001 From: Scott Bahling Date: Fri, 31 Jan 2020 13:08:50 +0100 Subject: use re for finding vendor macro --- obsapi/core.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'obsapi/core.py') diff --git a/obsapi/core.py b/obsapi/core.py index cf2ec37..57903e5 100644 --- a/obsapi/core.py +++ b/obsapi/core.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- # +import re from io import BytesIO from lxml import etree from collections import namedtuple @@ -287,14 +288,13 @@ class ObsApi(object): else: repos = self.get_project_repos(prj) + vendor_re = re.compile(r'.*vendor (.+?)\n') vendor = None for repo in repos: - for line in self.get_build_config(prj, repo).splitlines(): - if line.strip().startswith('%vendor '): - vendor = line.split(' ', 1)[1] - - # We take the first occurance - if vendor is not None: + prj_config = self.get_build_config(prj, repo) + matches = vendor_re.findall(prj_config) + if matches: + vendor = matches[-1] break return vendor -- cgit v1.2.3