mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-06 15:43:39 +02:00
Code Activity

Refactor DebQuery.__parse_control a bit

Browse Source 
No functional changes. This just simplifies the upcoming python3
port a bit.
This commit is contained in:
Marcus Huewe
2019-01-27 17:35:47 +01:00
parent f63a0957af
commit bb9f9a7fde
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osc/util/debquery.py
View File

@@ -85,18 +85,22 @@ class DebQuery(packagequery.PackageQuery, packagequery.PackageQueryResult):
self.fields['version'] = verep[1]
else:
self.fields['epoch'] = '0'
self.fields['provides'] = [ i.strip() for i in re.split(',\s*', self.fields.get('provides', '')) if i ]
self.fields['depends'] = [ i.strip() for i in re.split(',\s*', self.fields.get('depends', '')) if i ]
self.fields['pre_depends'] = [ i.strip() for i in re.split(',\s*', self.fields.get('pre_depends', '')) if i ]
self.fields['conflicts'] = [ i.strip() for i in re.split(',\s*', self.fields.get('conflicts', '')) if i ]
self.fields['breaks'] = [ i.strip() for i in re.split(',\s*', self.fields.get('breaks', '')) if i ]
self.fields['recommends'] = [ i.strip() for i in re.split(',\s*', self.fields.get('recommends', '')) if i ]
self.fields['suggests'] = [ i.strip() for i in re.split(',\s*', self.fields.get('suggests', '')) if i ]
self.fields['enhances'] = [ i.strip() for i in re.split(',\s*', self.fields.get('enhances', '')) if i ]
self.fields['provides'] = self._split_field_value('provides')
self.fields['depends'] = self._split_field_value('depends')
self.fields['pre_depends'] = self._split_field_value('pre_depends')
self.fields['conflicts'] = self._split_field_value('conflicts')
self.fields['breaks'] = self._split_field_value('breaks')
self.fields['recommends'] = self._split_field_value('recommends')
self.fields['suggests'] = self._split_field_value('suggests')
self.fields['enhances'] = self._split_field_value('enhances')
if self_provides:
# add self provides entry
self.fields['provides'].append('%s (= %s)' % (self.name(), '-'.join(versrel)))
def _split_field_value(self, field, delimeter=b',\s*'):
return [i.strip()
for i in re.split(delimeter, self.fields.get(field, b'')) if i]
def vercmp(self, debq):
res = cmp(int(self.epoch()), int(debq.epoch()))
if res != 0: