mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-25 01:16:14 +01:00
Code

- do not crash in setlinkrev, if link target is no link.

Browse Source
This commit is contained in:
Adrian Schröter 2011-02-14 15:57:42 +01:00
parent 380f41b9a4
commit 70e3cbbd33
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osc/core.py
View File

@ -5413,6 +5413,7 @@ def set_link_rev(apiurl, project, package, revision = None, use_xsrcmd5 = None,
# set revision element # set revision element
src_project = root.attrib['project'] src_project = root.attrib['project']
src_package = root.attrib['package'] src_package = root.attrib['package']
xsrcmd5 = None
if not revision: if not revision:
root.attrib['rev'] = show_upstream_rev(apiurl, src_project, src_package) root.attrib['rev'] = show_upstream_rev(apiurl, src_project, src_package)
elif revision == -1: elif revision == -1:
@ -5423,16 +5424,18 @@ def set_link_rev(apiurl, project, package, revision = None, use_xsrcmd5 = None,
if use_xsrcmd5: if use_xsrcmd5:
if use_baserev: if use_baserev:
try: try:
root.attrib['rev'] = show_upstream_xsrcmd5(apiurl, src_project, src_package, revision=root.attrib['rev'], linkrev='base' ) xsrcmd5 = show_upstream_xsrcmd5(apiurl, src_project, src_package, revision=root.attrib['rev'], linkrev='base' )
except oscerr.LinkExpandError, e: except oscerr.LinkExpandError, e:
e.osc_msg = 'Unable to merge packages via links from package \'%s\' for project \'%s\'. These revisions have never worked!' % (package, project) e.osc_msg = 'Unable to merge packages via links from package \'%s\' for project \'%s\'. These revisions have never worked!' % (package, project)
raise raise
else: else:
try: try:
root.attrib['rev'] = show_upstream_xsrcmd5(apiurl, src_project, src_package, revision=root.attrib['rev'] ) xsrcmd5 = show_upstream_xsrcmd5(apiurl, src_project, src_package, revision=root.attrib['rev'] )
except oscerr.LinkExpandError, e: except oscerr.LinkExpandError, e:
e.osc_msg = 'Unable to merge packages via links from package \'%s\' for project \'%s\'. Please try again using baserev to use source revisions when created the commits.' % (package, project) e.osc_msg = 'Unable to merge packages via links from package \'%s\' for project \'%s\'. Please try again using baserev to use source revisions when created the commits.' % (package, project)
raise raise
if xsrcmd5:
root.attrib['rev'] = xsrcmd5
l = ET.tostring(root) l = ET.tostring(root)
# upload _link file again # upload _link file again