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

- don't crash when src server decides to expand in any case (when one package

Browse Source 
is a link and the other not).
This commit is contained in:
Adrian Schröter
2011-02-14 11:30:37 +01:00
parent fa5e07f792
commit a86c7b9311
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osc/core.py
View File

@@ -3919,7 +3919,7 @@ def server_diff_noex(apiurl,
old_project, old_package, old_revision,
new_project, new_package, new_revision,
unified, missingok, meta, expand)
except urllib2.HTTPError, e:
except:
msg = None
body = None
try:
@@ -3931,10 +3931,13 @@ def server_diff_noex(apiurl,
if expand:
rdiff = "## diff on expanded link not possible, showing unexpanded version\n"
rdiff += server_diff_noex(apiurl,
old_project, old_package, old_revision,
new_project, new_package, new_revision,
unified, missingok, meta, False)
try:
rdiff += server_diff_noex(apiurl,
old_project, old_package, old_revision,
new_project, new_package, new_revision,
unified, missingok, meta, False)
except:
return 'error: diffing failed: %s' % body.find('summary').text
return rdiff