mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-09-20 01:06:17 +02:00
Code

prepare for the serviceinfo element having an xsrcmd5 in the error case

Browse Source
This commit is contained in:
Michael Schroeder 2013-10-18 14:58:18 +02:00
parent 5ef2d4035c
commit 930974b4ab
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osc/core.py
View File

@ -3389,8 +3389,9 @@ def show_upstream_srcmd5(apiurl, prj, pac, expand=False, revision=None, meta=Fal
et = ET.fromstring(''.join(m))
if include_service_files:
try:
if et.find('serviceinfo') and et.find('serviceinfo').get('xsrcmd5'):
return et.find('serviceinfo').get('xsrcmd5')
sinfo = et.find('serviceinfo')
if sinfo and sinfo.get('xsrcmd5') and not sinfo.get('error'):
return sinfo.get('xsrcmd5')
except:
pass
return et.get('srcmd5')
@ -3425,7 +3426,9 @@ def show_upstream_rev(apiurl, prj, pac, revision=None, expand=False, linkrev=Non
et = ET.fromstring(''.join(m))
if include_service_files:
try:
return et.find('serviceinfo').get('xsrcmd5')
sinfo = et.find('serviceinfo')
if sinfo and sinfo.get('xsrcmd5') and not sinfo.get('error'):
return sinfo.get('xsrcmd5')
except:
pass
return et.get('rev')