diff options
| author | Chris Lumens <clumens@redhat.com> | 2006-08-03 19:37:27 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2006-08-03 19:37:27 +0000 |
| commit | fbeb1a00e301732ac584231a3003e8f30d93eaa4 (patch) | |
| tree | 708989f50524c97470f27508e4725711893cf1f8 | |
| parent | e0e7ee11ce22175e4ef9031c2502d062363b474a (diff) | |
| download | anaconda-fbeb1a00e301732ac584231a3003e8f30d93eaa4.tar.gz anaconda-fbeb1a00e301732ac584231a3003e8f30d93eaa4.tar.xz anaconda-fbeb1a00e301732ac584231a3003e8f30d93eaa4.zip | |
Don't add an extra slash, as urlparse gets confused easily (#210232).
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | iw/release_notes.py | 8 |
2 files changed, 6 insertions, 5 deletions
@@ -20,6 +20,9 @@ * loader2/loader.c (doLoaderMain): Don't show method menu if we're installing from CD (#201108). + * iw/release_notes.py (ReleaseNotesViewer.getReleaseNotes): Don't add + an extra slash, as urlparse gets confused easily (#210232). + 2006-08-03 Jeremy Katz <katzj@redhat.com> * scripts/upd-instroot: Add libvolume_id for gfs2-utils diff --git a/iw/release_notes.py b/iw/release_notes.py index 81e995e60..597fb3933 100644 --- a/iw/release_notes.py +++ b/iw/release_notes.py @@ -60,9 +60,7 @@ class ReleaseNotesViewer: for suffix in suffixList: fn = "RELEASE-NOTES%s" % (suffix,) try: - tmpfile = os.path.abspath("/" + - self.anaconda.dispatch.method.getFilename(fn, - destdir="/tmp", retry=0)) + tmpfile = os.path.abspath(self.anaconda.dispatch.method.getFilename(fn, destdir="/tmp", retry=0)) if tmpfile is None: continue @@ -125,11 +123,11 @@ class ReleaseNotesViewer: uri = self.getReleaseNotes() if uri is not None: - if os.access(uri, os.R_OK): + if os.access(uri, os.R_OK): try: f = self.openURI(uri) except OSError: - log.info("Failed to open %s" % (link,)) + self.log("Failed to open %s" % (link,)) return if f is not None: |