Merge lp:~jibel/update-manager/bug.565896 into lp:update-manager

Proposed by Jean-Baptiste Lallement
Status: Merged
Merged at revision: 1887
Proposed branch: lp:~jibel/update-manager/bug.565896
Merge into: lp:update-manager
Diff against target: 24 lines (+10/-4)
1 file modified
UpdateManager/Core/MyCache.py (+10/-4)
To merge this branch: bzr merge lp:~jibel/update-manager/bug.565896
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+23635@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UpdateManager/Core/MyCache.py'
2--- UpdateManager/Core/MyCache.py 2010-04-13 09:27:00 +0000
3+++ UpdateManager/Core/MyCache.py 2010-04-18 21:38:12 +0000
4@@ -272,10 +272,16 @@
5 self.all_changes[name] += changelog
6 return
7 except urllib2.HTTPError, e:
8- pass
9- # no changelogs_uri or 404
10- self.all_changes[name] += _( "This change is not coming from a "
11- "source that supports changelogs.")
12+ # no changelogs_uri or 404
13+ self.all_changes[name] += _( "This change is not coming from a "
14+ "source that supports changelogs.")
15+ except (IOError, httplib.BadStatusLine, socket.error), e:
16+ # network errors and others
17+ print "caught exception: ", e
18+ self.all_changes[name] += _("Failed to download the list "
19+ "of changes. \nPlease "
20+ "check your Internet "
21+ "connection.")
22 return
23 # fixup epoch handling version
24 srcpkg = self[name].sourcePackageName

Subscribers

People subscribed via source and target branches

to status/vote changes: