Mailinglist Archive: yast-commit (535 mails)

< Previous Next >
[yast-commit] r41382 - in /trunk/installation: package/yast2-installation.changes src/clients/release_notes_popup.ycp
  • From: jsrain@xxxxxxxxxxxxxxxx
  • Date: Thu, 11 Oct 2007 13:25:35 -0000
  • Message-id: <20071011132535.6EBE545150@xxxxxxxxxxxxxxxx>
Author: jsrain
Date: Thu Oct 11 15:25:35 2007
New Revision: 41382

URL: http://svn.opensuse.org/viewcvs/yast?rev=41382&view=rev
Log:
show release notes properly in live installation (#332862)


Modified:
    trunk/installation/package/yast2-installation.changes
    trunk/installation/src/clients/release_notes_popup.ycp

Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=41382&r1=41381&r2=41382&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Thu Oct 11 15:25:35 2007
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Thu Oct 11 15:00:03 CEST 2007 - jsrain@xxxxxxx
+
+- show release notes properly in live installation (#332862)
+
+-------------------------------------------------------------------
 Wed Oct  3 17:50:11 CEST 2007 - locilka@xxxxxxx
 
 - Added "Network Type" information to the First Stage Network Setup

Modified: trunk/installation/src/clients/release_notes_popup.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/release_notes_popup.ycp?rev=41382&r1=41381&r2=41382&view=diff
==============================================================================
--- trunk/installation/src/clients/release_notes_popup.ycp (original)
+++ trunk/installation/src/clients/release_notes_popup.ycp Thu Oct 11 15:25:35 2007
@@ -17,6 +17,7 @@
     import "Label";
     import "Stage";
     import "Packages";
+    import "Mode";
 
     /* filename of release notes */
     string file = "";
@@ -67,9 +68,42 @@
        return false;
     };
 
+    // in live installation, the release notes are in the /usr/doc directory, find right file there (bug 332862)
+    define boolean find_release_notes ()
+    {
+       y2milestone ("Finding release notes in local filesystem");
+       // FIXME hardcoded product name
+        string path_to_relnotes = "/usr/share/doc/release-notes/openSUSE/";
+       string path_templ = path_to_relnotes + "/RELEASE-NOTES.%1.rtf";
+       y2debug ("Path template: %1", path_templ);
+       string tmp = sformat (path_templ, Language::language);
+       y2debug ("Trying to get %1", tmp);
+       if (0 >= (integer)SCR::Read (.target.size, tmp))
+       {
+           tmp = sformat (path_templ, substring (Language::language, 0, 2));
+           y2debug ("Trying to get %1", tmp);
+       }
+       if (0 >= (integer)SCR::Read (.target.size, tmp))
+       {
+           tmp = sformat (path_templ, "en");
+           y2debug ("Trying to get %1", tmp);
+       }
+       if (0 >= (integer)SCR::Read (.target.size, tmp))
+           return false;
+
+       y2milestone ("Reading file %1", tmp);
+       text = (string)SCR::Read (.target.string, [tmp, ""]);
+       if (text != "" && text != nil)
+           return true;
+       return false;
+    }
+
     y2milestone ("Calling: Release Notes Popup");
 
-    if (! load_release_notes ())
+    if (! (Mode::live_installation ()
+       ? find_release_notes ()
+       : load_release_notes ()
+    ))
     {
        // error report
        Report::Error (_("Cannot load release notes."));

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages