← Back to branch summary

~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to loggerhead/controllers/revision_ui.py

merge jamesh's fix for bug 89854: on error, report an error instead of
trying to redirect to a safe page.  there's no guaranteed safe page.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/revision_ui.py
24
24
import time
25
25
 
26
26
import turbogears
27
 
from cherrypy import HTTPRedirect, session
 
27
from cherrypy import InternalError, session
28
28
 
29
29
from loggerhead import util
30
30
 
57
57
        
58
58
        try:
59
59
            revid, start_revid, revid_list = h.get_view(revid, start_revid, file_id, query)
60
 
        except Exception, x:
61
 
            self.log.error('Exception fetching changes: %s' % (x,))
62
 
            util.log_exception(self.log)
63
 
            raise HTTPRedirect(self._branch.url('/changes'))
 
60
        except:
 
61
            self.log.exception('Exception fetching changes')
 
62
            raise InternalError('Could not fetch changes')
64
63
        
65
64
        navigation = util.Container(revid_list=revid_list, revid=revid, start_revid=start_revid, file_id=file_id,
66
65
                                    pagesize=1, scan_url='/revision', branch=self._branch, feed=True)