Software Updater

Merge lp:~brian-murray/update-manager/open-url-fix into lp:update-manager

  1. open-url-fix
  2. Merge into main
Proposed by Brian Murray
Status: Merged
Merged at revision: 2057
Proposed branch: lp:~brian-murray/update-manager/open-url-fix
Merge into: lp:update-manager
Diff against target: 47 lines (+14/-3)
3 files modified
UpdateManager/ChangelogViewer.py (+3/-1)
UpdateManager/ReleaseNotesViewer.py (+4/-2)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/update-manager/open-url-fix
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+53721@code.launchpad.net

Description of the change

The os.path check for gnome-open was missing a leading /.

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/ChangelogViewer.py'
2--- UpdateManager/ChangelogViewer.py 2009-07-16 15:25:23 +0000
3+++ UpdateManager/ChangelogViewer.py 2011-03-17 00:04:23 +0000
4@@ -212,7 +212,9 @@
5 def open_url(self, url):
6 """Open the specified URL in a browser"""
7 # Find an appropiate browser
8- if os.path.exists("/usr/bin/exo-open"):
9+ if os.path.exists("/usr/bin/xdg-open"):
10+ command = ["xdg-open", url]
11+ elif os.path.exists("/usr/bin/exo-open"):
12 command = ["exo-open", url]
13 elif os.path.exists('/usr/bin/gnome-open'):
14 command = ['gnome-open', url]
15
16=== modified file 'UpdateManager/ReleaseNotesViewer.py'
17--- UpdateManager/ReleaseNotesViewer.py 2011-02-16 16:51:09 +0000
18+++ UpdateManager/ReleaseNotesViewer.py 2011-03-17 00:04:23 +0000
19@@ -123,9 +123,11 @@
20 def open_url(self, url):
21 """Open the specified URL in a browser"""
22 # Find an appropiate browser
23- if os.path.exists("/usr/bin/exo-open"):
24+ if os.path.exists("/usr/bin/xdg-open"):
25+ command = ["xdg-open", url]
26+ elif os.path.exists("/usr/bin/exo-open"):
27 command = ["exo-open", url]
28- elif os.path.exists('usr/bin/gnome-open'):
29+ elif os.path.exists('/usr/bin/gnome-open'):
30 command = ['gnome-open', url]
31 else:
32 command = ['x-www-browser', url]
33
34=== modified file 'debian/changelog'
35--- debian/changelog 2011-03-15 20:02:16 +0000
36+++ debian/changelog 2011-03-17 00:04:23 +0000
37@@ -1,3 +1,10 @@
38+update-manager (1:0.146.6) natty; urgency=low
39+
40+ * UpdateManager/ReleaseNotesViewer.py: fix the path for gnome-open
41+ and default to xdg-open (LP: #693131)
42+
43+ -- Brian Murray <brian@ubuntu.com> Wed, 16 Mar 2011 16:46:44 -0700
44+
45 update-manager (1:0.146.5) natty; urgency=low
46
47 * fix FTBFS by including a apt_clone.py copy until apt-clone

Subscribers

People subscribed via source and target branches

to status/vote changes: