1
0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-09 04:25:48 +01:00

- fix "osc up -S" including service files, regression in 0.142 from commit 930974b4ab56755d42a63d18978a7ac957c6a437

This commit is contained in:
Adrian Schröter 2014-01-21 18:08:36 +01:00
parent cf35fb441f
commit 9e07851310

View File

@ -3410,7 +3410,7 @@ def show_upstream_srcmd5(apiurl, prj, pac, expand=False, revision=None, meta=Fal
if include_service_files: if include_service_files:
try: try:
sinfo = et.find('serviceinfo') sinfo = et.find('serviceinfo')
if sinfo and sinfo.get('xsrcmd5') and not sinfo.get('error'): if sinfo != None and sinfo.get('xsrcmd5') and not sinfo.get('error'):
return sinfo.get('xsrcmd5') return sinfo.get('xsrcmd5')
except: except:
pass pass
@ -3447,7 +3447,7 @@ def show_upstream_rev(apiurl, prj, pac, revision=None, expand=False, linkrev=Non
if include_service_files: if include_service_files:
try: try:
sinfo = et.find('serviceinfo') sinfo = et.find('serviceinfo')
if sinfo and sinfo.get('xsrcmd5') and not sinfo.get('error'): if sinfo != None and sinfo.get('xsrcmd5') and not sinfo.get('error'):
return sinfo.get('xsrcmd5') return sinfo.get('xsrcmd5')
except: except:
pass pass