mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-05 10:58:07 +01:00
Code

do not use complex path separator fixes #385

Browse Source 
This is a fix for issue #385. osc commit breaks due to
the use of sfilelist.findall('.//entry[@hash]')

I now will iterate through the sfilelist and use

for entry in sfilelist.findall('entry'):
    if entry.get('hash'):
        ... execute hash code ...

This is a little bit slower, but should not break
on SLE11 anymore
This commit is contained in:
Marco Strigl 2018-02-23 11:55:14 +01:00
parent 0b241a9586
commit e017a8e237
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osc/core.py
View File

@ -1503,9 +1503,10 @@ class Package:
print('Transmitting file data', end=' ') print('Transmitting file data', end=' ')
filelist = self.__generate_commitlist(todo_send) filelist = self.__generate_commitlist(todo_send)
sfilelist = self.__send_commitlog(msg, filelist, validate=True) sfilelist = self.__send_commitlog(msg, filelist, validate=True)
if sfilelist.get('error') and sfilelist.findall('.//entry[@hash]'): hash_entries = [e for e in sfilelist.findall('entry') if e.get('hash') is not None]
if sfilelist.get('error') and hash_entries:
name2elem = dict([(e.get('name'), e) for e in filelist.findall('entry')]) name2elem = dict([(e.get('name'), e) for e in filelist.findall('entry')])
for entry in sfilelist.findall('.//entry[@hash]'): for entry in hash_entries:
filename = entry.get('name') filename = entry.get('name')
fileelem = name2elem.get(filename) fileelem = name2elem.get(filename)
if filename not in sha256sums: if filename not in sha256sums: