removed hardcoding of /mnt/source, parse RELEASE-NOTES.html as html, search for both plain text and HTML RELEASE-NOTES, convert to utf8

3 files changed, 33 insertions, 17 deletions

diff --git a/gui.py b/gui.py
index 6e5b843dd..a1f480a1d 100755
--- a/gui.py
+++ b/gui.py
@@ -485,14 +485,12 @@ class InstallControlWindow:
         
         self.textWin.set_position (gtk.WIN_POS_CENTER)
 
-        if self.buff != "":
-            buffer = gtk.TextBuffer(None)
-            buffer.set_text(self.buff)
+        if self.releaseNotesBuffer:
             text = gtk.TextView()
-            text.set_buffer(buffer)
+            text.set_buffer(self.releaseNotesBuffer)
             text.set_property("editable", gtk.FALSE)
             text.set_property("cursor_visible", gtk.FALSE)
-                
+            
             sw = gtk.ScrolledWindow()
             sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_ALWAYS)
             sw.set_shadow_type(gtk.SHADOW_IN)
@@ -526,20 +524,32 @@ class InstallControlWindow:
             self.textWin.show_all()
 
     def loadReleaseNotes(self):
-        self.buff = ""
 	langList = self.langSearchPath + [ "" ]
+        sourcepath = self.dispatch.method.getSourcePath()
 	for lang in langList:
-	    fn = "/mnt/source/RELEASE-NOTES"
-	    if len(lang):
-		fn = fn + "." + lang
-
-	    if os.access(fn, os.R_OK):
-		file = open(fn, "r")
-		self.buff = string.join(file.readlines(), '')
-		file.close()
-		return
-
-	self.buff = _("Release notes are missing.\n")
+	    if lang:
+                langpart = '.%s' % (lang,)
+            else:
+                langpart = ''
+                
+            for suffix in ('.html', ''):
+                fn = '%s/RELEASE-NOTES%s%s' % (sourcepath, langpart, suffix)
+                if os.access(fn, os.R_OK):
+                    file = open(fn, "r")
+                    if suffix == '.html':
+                        buffer = htmlbuffer.HTMLBuffer()
+                        buffer.feed(utf8(file.read()))
+                        self.releaseNotesBuffer = buffer.get_buffer()
+                    else:
+                        buffer = gtk.TextBuffer(None)
+                        buffer.set_text(utf8(file.read()))
+                        self.releaseNotesBuffer = buffer
+                    file.close()
+                    return
+            
+        buffer = gtk.TextBuffer(None)
+        buffer.set_text(_("Release notes are missing.\n"))
+        self.releaseNotesBuffer = buffer
 
     def handleRenderCallback(self):
         self.currentWindow.renderCallback()
diff --git a/image.py b/image.py
index 17a802bb8..f02130882 100644
--- a/image.py
+++ b/image.py
@@ -25,6 +25,9 @@ class ImageInstallMethod(InstallMethod):
     def mergeFullHeaders(self, hdlist):
 	hdlist.mergeFullHeaders(self.tree + "/RedHat/base/hdlist2")
 
+    def getSourcePath(self):
+        return self.tree
+
     def __init__(self, tree):
 	InstallMethod.__init__(self)
 	self.tree = tree
diff --git a/installmethod.py b/installmethod.py
index a4441dfef..eca10b328 100644
--- a/installmethod.py
+++ b/installmethod.py
@@ -26,3 +26,6 @@ class InstallMethod:
 
     def __init__(self):
 	pass
+
+    def getSourcePath(self):
+        pass