Mailinglist Archive: yast-commit (545 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Thu Jan  7 15:27:42 2010
New Revision: 60274

URL: http://svn.opensuse.org/viewcvs/yast?rev=60274&view=rev
Log:
- added firstboot_licenses step able to show 2 license texts
  (fate#306295)
- adapt to Language::SwitchToEnglishIfNeeded (bnc#479529)
- 2.19.1


Added:
    trunk/firstboot/src/firstboot_licenses.ycp   (with props)
Modified:
    trunk/firstboot/VERSION
    trunk/firstboot/doc/firstboot-section_mod.xml
    trunk/firstboot/package/yast2-firstboot.changes
    trunk/firstboot/src/Makefile.am
    trunk/firstboot/src/control/firstboot.xml
    trunk/firstboot/src/firstboot_language_keyboard.ycp
    trunk/firstboot/yast2-firstboot.spec.in

Modified: trunk/firstboot/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=60274&r1=60273&r2=60274&view=diff
==============================================================================
--- trunk/firstboot/VERSION (original)
+++ trunk/firstboot/VERSION Thu Jan  7 15:27:42 2010
@@ -1 +1 @@
-2.19.0
+2.19.1

Modified: trunk/firstboot/doc/firstboot-section_mod.xml
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/doc/firstboot-section_mod.xml?rev=60274&r1=60273&r2=60274&view=diff
==============================================================================
--- trunk/firstboot/doc/firstboot-section_mod.xml (original)
+++ trunk/firstboot/doc/firstboot-section_mod.xml Thu Jan  7 15:27:42 2010
@@ -143,6 +143,10 @@
          </para>
 
          <para>
+         To show two license texts in one dialog (typically the one from 
vendor and one from Novell), use 'firstboot_license_novell' step in your 
firstboot.xml file. This client will use the license texts specified by both 
FIRSTBOOT_LICENSE_DIR and FIRSTBOOT_NOVELL_LICENSE_DIR.
+         </para>
+
+         <para>
          If you want to use FIRSTBOOT_FINISH_FILE, you need to update the 
firstboot workflow so that it calls firstboot_finish instead
          of inst_finish. The recommended way of customizing the congratulate 
text is specifying it in the firstboot.xml control file.
          </para>

Modified: trunk/firstboot/package/yast2-firstboot.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboot.changes?rev=60274&r1=60273&r2=60274&view=diff
==============================================================================
--- trunk/firstboot/package/yast2-firstboot.changes (original)
+++ trunk/firstboot/package/yast2-firstboot.changes Thu Jan  7 15:27:42 2010
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Thu Jan  7 14:34:43 CET 2010 - jsuchome@xxxxxxx
+
+- added firstboot_licenses step able to show 2 license texts
+  (fate#306295)
+- adapt to Language::SwitchToEnglishIfNeeded (bnc#479529)
+- 2.19.1
+
+-------------------------------------------------------------------
 Tue Dec 22 13:04:01 CET 2009 - jsuchome@xxxxxxx
 
 - handle arguments from control file (bnc#566669)

Modified: trunk/firstboot/src/Makefile.am
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/Makefile.am?rev=60274&r1=60273&r2=60274&view=diff
==============================================================================
--- trunk/firstboot/src/Makefile.am (original)
+++ trunk/firstboot/src/Makefile.am Thu Jan  7 15:27:42 2010
@@ -11,6 +11,7 @@
        firstboot_language_keyboard.ycp \
        firstboot_timezone.ycp  \
        firstboot_license.ycp   \
+       firstboot_licenses.ycp  \
        firstboot_welcome.ycp   \
        firstboot_ssh.ycp       \
        firstboot_keyboard.ycp  \

Modified: trunk/firstboot/src/control/firstboot.xml
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/control/firstboot.xml?rev=60274&r1=60273&r2=60274&view=diff
==============================================================================
--- trunk/firstboot/src/control/firstboot.xml (original)
+++ trunk/firstboot/src/control/firstboot.xml Thu Jan  7 15:27:42 2010
@@ -104,6 +104,11 @@
                     <name>firstboot_welcome</name>
                 </module>
                 <module>
+                    <label>License Agreements</label>
+                    <enabled config:type="boolean">false</enabled>
+                    <name>firstboot_licenses</name>
+                </module>
+                <module>
                     <label>License Agreement</label>
                     <enabled config:type="boolean">true</enabled>
                     <name>firstboot_license_novell</name>

Modified: trunk/firstboot/src/firstboot_language_keyboard.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_language_keyboard.ycp?rev=60274&r1=60273&r2=60274&view=diff
==============================================================================
--- trunk/firstboot/src/firstboot_language_keyboard.ycp (original)
+++ trunk/firstboot/src/firstboot_language_keyboard.ycp Thu Jan  7 15:27:42 2010
@@ -137,13 +137,9 @@
            Language::Set (language);
        }
        // Check and set CJK languages
-       if (ret == `language && Language::CJKLanguage (language) &&
-           !Language::CJKLanguage (preselected) && Language::GetTextMode ())
+       if (ret == `language && Language::SwitchToEnglishIfNeeded (true))
        {
-           // popup message (user selected CJK language in text mode)
-           Popup::Message (_("The selected language cannot be used in text 
mode. English is used for
-installation, but the selected language will be used for the new system."));
-           Language::WfmSetGivenLanguage ("en_US");
+           y2debug ("UI switched to en_US");
        }
        else if (ret == `language)
        {

Added: trunk/firstboot/src/firstboot_licenses.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_licenses.ycp?rev=60274&view=auto
==============================================================================
--- trunk/firstboot/src/firstboot_licenses.ycp (added)
+++ trunk/firstboot/src/firstboot_licenses.ycp Thu Jan  7 15:27:42 2010
@@ -0,0 +1,49 @@
+/*
+ * Purpose     : Display 2 license texts (probably from vendor and Novell) 
during firstboot configuration
+ *
+ * $Id$
+ */
+
+{
+    textdomain "firstboot";
+
+    import "Misc";
+    import "GetInstArgs";
+    import "ProductFeatures";
+
+
+    any result = nil;
+
+    map args = GetInstArgs::argmap();
+
+    // default directory with Novell license texts
+    string default_dir = ProductFeatures::GetStringFeature ("globals",
+       "base_product_license_directory");
+
+    string dir1                = Misc::SysconfigRead (
+       .sysconfig.firstboot.FIRSTBOOT_LICENSE_DIR, "/etc/YaST2");
+    string dir2                = Misc::SysconfigRead (
+       .sysconfig.firstboot.FIRSTBOOT_NOVELL_LICENSE_DIR, default_dir);
+
+    if (dir2 != dir1)
+       args["directories"]     = [ dir1, dir2];
+    else
+       args["directories"]     = [ dir1 ];
+
+    args["action"] = Misc::SysconfigRead (
+       .sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort");
+
+    y2milestone("inst_license options: %1", args);
+
+    result = WFM::CallFunction( "inst_license", [ args ] );
+
+    if (result == `halt)
+    {
+       UI::CloseDialog();
+       y2milestone("Halting the system...");
+       SCR::Execute(.target.bash, "/sbin/halt");
+    }
+
+    return result;
+
+}

Modified: trunk/firstboot/yast2-firstboot.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/yast2-firstboot.spec.in?rev=60274&r1=60273&r2=60274&view=diff
==============================================================================
--- trunk/firstboot/yast2-firstboot.spec.in (original)
+++ trunk/firstboot/yast2-firstboot.spec.in Thu Jan  7 15:27:42 2010
@@ -13,10 +13,10 @@
 # yast2/NeworkDevices -> yast2/NetworkInterfaces
 Requires:      yast2 >= 2.16.23
 Requires:      yast2-bootloader
-# Keyboard::Write (), bnc#441404
-Requires:      yast2-country >= 2.18.14
-# Installation startup scripts
-Requires:      yast2-installation
+# Language::SwitchToEnglishIfNeeded
+Requires:      yast2-country >= 2.19.5
+# new version of inst_license
+Requires:      yast2-installation >= 2.19.0
 
 BuildArchitectures:    noarch
 

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