February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55335 - in /trunk: libyui/ libyui/package/ libyui/src/ ncurses/ ncurses/package/ qt/ qt/package/ ycp-ui-bindings/ ycp-ui-bindings/package/
by sh-sh-sh＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: sh-sh-sh Date: Mon Feb 9 11:55:45 2009 New Revision: 55335 URL: http://svn.opensuse.org/viewcvs/yast?rev=55335&view=rev Log: - Added virtual destructor to YTableCell for better NCFileSelection support -> libyui API change - Require latest libyui in packages using libyui Modified: trunk/libyui/VERSION trunk/libyui/package/yast2-libyui.changes trunk/libyui/src/YTableItem.h trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/yast2-ncurses.spec.in trunk/qt/package/yast2-qt.changes trunk/qt/yast2-qt.spec.in trunk/ycp-ui-bindings/VERSION trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Modified: trunk/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=55335&r1=5533… ============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Mon Feb 9 11:55:45 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/libyui/package/yast2-libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/package/yast2-libyui.chan… ============================================================================== --- trunk/libyui/package/yast2-libyui.changes (original) +++ trunk/libyui/package/yast2-libyui.changes Mon Feb 9 11:55:45 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 9 11:43:42 CET 2009 - sh(a)suse.de + +- Added virtual destructor for YTableCell for better + NCFileSelection support +- V 2.18.4 + +------------------------------------------------------------------- Tue Jan 27 15:33:29 CET 2009 - aschnell(a)suse.de - extended YGraph for simple user-interaction Modified: trunk/libyui/src/YTableItem.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YTableItem.h?rev=5533… ============================================================================== --- trunk/libyui/src/YTableItem.h (original) +++ trunk/libyui/src/YTableItem.h Mon Feb 9 11:55:45 2009 @@ -234,8 +234,13 @@ , _column ( column ) {} - // No virtual destructor. This saves a vtable for this class since there - // are no other virtual methods either. + /** + * Destructor. Not strictly needed inside this class, but useful for + * derived classes. Since this is the only virtual method of this class, + * the cost of this is a vtable for this class and a pointer to the vtable + * in each instance. + **/ + virtual ~YTableCell() {} /** * Return this cells's label. This is what the user sees in a dialog, so Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=55335&r1=553… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Mon Feb 9 11:55:45 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Mon Feb 9 11:55:45 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 9 11:53:36 CET 2009 - sh(a)suse.de + +- Require latest libyui in spec file (API change) +- V 2.18.3 + +------------------------------------------------------------------- Tue Jan 20 16:50:55 CET 2009 - kmachalkova(a)suse.cz - Table widget: two variants of addItem method (all-at-once and Modified: trunk/ncurses/yast2-ncurses.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/yast2-ncurses.spec.in?re… ============================================================================== --- trunk/ncurses/yast2-ncurses.spec.in (original) +++ trunk/ncurses/yast2-ncurses.spec.in Mon Feb 9 11:55:45 2009 @@ -8,8 +8,8 @@ Summary: - Provides: yast2_ui Requires: glibc-locale -BuildRequires: yast2-libyui-devel >= 2.17.14 -Requires: yast2-libyui >= 2.17.14 +BuildRequires: yast2-libyui-devel >= 2.18.4 +Requires: yast2-libyui >= 2.18.4 Recommends: yast2-ncurses-pkg %description - Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Mon Feb 9 11:55:45 2009 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- -Wed Feb 4 18:25:40 CET 2009 - sh(a)suse.de +Mon Feb 9 11:52:34 CET 2009 - sh(a)suse.de +- Require latest libyui in spec file (API change) - V 2.18.5 ------------------------------------------------------------------- Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=55335&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Mon Feb 9 11:55:45 2009 @@ -16,8 +16,8 @@ Summary: - BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-libyui-devel >= 2.17.14 -Requires: yast2-libyui >= 2.17.14 +BuildRequires: yast2-libyui-devel >= 2.18.4 +Requires: yast2-libyui >= 2.18.4 Requires: yast2_theme >= 2.16.1 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt Modified: trunk/ycp-ui-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/VERSION?rev=5533… ============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Mon Feb 9 11:55:45 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/package/yast2-yc… ============================================================================== --- trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes (original) +++ trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes Mon Feb 9 11:55:45 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 9 11:52:05 CET 2009 - sh(a)suse.de + +- Require latest libyui in spec file (API change) +- V 2.18.3 + +------------------------------------------------------------------- Wed Jan 14 16:25:57 CET 2009 - aschnell(a)suse.de - added graph widget Modified: trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/yast2-ycp-ui-bin… ============================================================================== --- trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in (original) +++ trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Mon Feb 9 11:55:45 2009 @@ -19,8 +19,8 @@ # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -Requires: yast2-libyui >= 2.17.14 -BuildRequires: yast2-libyui-devel >= 2.17.14 +Requires: yast2-libyui >= 2.18.4 +BuildRequires: yast2-libyui-devel >= 2.18.4 # libyui ImplPtr BuildRequires: boost-devel -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55334 - /trunk/ycp-ui-bindings/examples/Tree1.ycp
by sh-sh-sh＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: sh-sh-sh Date: Mon Feb 9 11:50:57 2009 New Revision: 55334 URL: http://svn.opensuse.org/viewcvs/yast?rev=55334&view=rev Log: Reasonable initial size Modified: trunk/ycp-ui-bindings/examples/Tree1.ycp Modified: trunk/ycp-ui-bindings/examples/Tree1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/Tree1.y… ============================================================================== --- trunk/ycp-ui-bindings/examples/Tree1.ycp (original) +++ trunk/ycp-ui-bindings/examples/Tree1.ycp Mon Feb 9 11:50:57 2009 @@ -2,54 +2,55 @@ { UI::OpenDialog( `VBox( - `Tree(`id(`dest_dir), - "Select destination directory:", - [ - `item(`id(`root), "/" , true, - [ - `item(`id(`etc), "etc", - [ - `item("opt"), - `item("SuSEconfig"), - `item("X11") - ] - ), - `item("usr", false, - [ - "bin", - "lib", - `item("share", - [ - "man", - "info", - "emacs" - ] - ), - `item(`id(`usr_local),"local"), - `item("X11R6", - [ - "bin", - "lib", - "share", - "man", - "etc" - ] - ) - ] - ), - `item(`id(`opt), "opt", true, - [ - "kde", - "netscape", - "Office51" - ] - ), - `item("home"), - "work", - `item(`id(`other), "<other>") - ] - ) - ] ), + `MinSize( 30, 10, + `Tree(`id(`dest_dir), + "Select destination directory:", + [ + `item(`id(`root), "/" , false, + [ + `item(`id(`etc), "etc", + [ + `item("opt"), + `item("SuSEconfig"), + `item("X11") + ] + ), + `item("usr", false, + [ + "bin", + "lib", + `item("share", + [ + "man", + "info", + "emacs" + ] + ), + `item(`id(`usr_local),"local"), + `item("X11R6", + [ + "bin", + "lib", + "share", + "man", + "etc" + ] + ) + ] + ), + `item(`id(`opt), "opt", false, + [ + "kde", + "netscape", + "Office51" + ] + ), + `item("home", false), + `item(`id(`other), "<other>") + ] + ) + ] ) + ), `HBox( `PushButton(`id(`sel_opt), `opt(`hstretch), "/&opt" ), `PushButton(`id(`sel_usr), `opt(`hstretch), "/&usr" ), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55333 - /trunk/storage/storage/src/include/ep-hd-dialogs.ycp
by aschnell＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: aschnell Date: Mon Feb 9 11:34:03 2009 New Revision: 55333 URL: http://svn.opensuse.org/viewcvs/yast?rev=55333&view=rev Log: - round size during creation of partitions Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Mon Feb 9 11:34:03 2009 @@ -102,8 +102,11 @@ list<integer> region = data["region"]:slot; integer size_k = (region[1]:0 * cyl_size) / 1024; - integer min_size_k = tointeger(float::ceil(cyl_size / 1024.0)); - integer max_size_k = (slot[1]:0 * cyl_size) / 1024; + integer min_num_cyl = 1; + integer max_num_cyl = slot[1]:0; + + integer min_size_k = tointeger(min_num_cyl * cyl_size / 1024.0); + integer max_size_k = tointeger(max_num_cyl * cyl_size / 1024.0); symbol type = data["type"]:`unknown; symbol what = `nothing; // ;-) @@ -240,7 +243,8 @@ case `manual_size: { - integer num_cyl = size_k * 1024 / cyl_size; + integer num_cyl = tointeger(1024.0 * size_k / cyl_size + 0.5); + num_cyl = Integer::Clamp(num_cyl, min_num_cyl, max_num_cyl); data["region"] = [ slot[0]:0, num_cyl ]; break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55332 - /trunk/qt/package/yast2-qt.changes
by sh-sh-sh＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: sh-sh-sh Date: Mon Feb 9 11:32:12 2009 New Revision: 55332 URL: http://svn.opensuse.org/viewcvs/yast?rev=55332&view=rev Log: fixed abuild complaint about change log Modified: trunk/qt/package/yast2-qt.changes Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Mon Feb 9 11:32:12 2009 @@ -1,9 +1,13 @@ ------------------------------------------------------------------- Wed Feb 4 18:25:40 CET 2009 - sh(a)suse.de +- V 2.18.5 + +------------------------------------------------------------------- +Thu Jan 15 15:30:46 CET 2009 - sh(a)suse.de + - Workaround for bnc #440101: Double clicks in Oxygen theme Now no longer using itemActivated signal, but itemDoubleClicked -- V 2.18.5 ------------------------------------------------------------------- Wed Jan 14 14:38:55 CET 2009 - kmachalkova(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55331 - in /branches/SuSE-Code-11-Branch/reipl: VERSION package/yast2-reipl.changes src/Reipl.ycp src/inst_reiplauto.ycp src/reipl_bootloader_finish.ycp src/reipl_finish.ycp
by jsrain＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: jsrain Date: Mon Feb 9 10:57:00 2009 New Revision: 55331 URL: http://svn.opensuse.org/viewcvs/yast?rev=55331&view=rev Log: reverted last patch (different one submitted to autobuild by Hannes) Modified: branches/SuSE-Code-11-Branch/reipl/VERSION branches/SuSE-Code-11-Branch/reipl/package/yast2-reipl.changes branches/SuSE-Code-11-Branch/reipl/src/Reipl.ycp branches/SuSE-Code-11-Branch/reipl/src/inst_reiplauto.ycp branches/SuSE-Code-11-Branch/reipl/src/reipl_bootloader_finish.ycp branches/SuSE-Code-11-Branch/reipl/src/reipl_finish.ycp Modified: branches/SuSE-Code-11-Branch/reipl/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/VERSION (original) +++ branches/SuSE-Code-11-Branch/reipl/VERSION Mon Feb 9 10:57:00 2009 @@ -1 +1 @@ -2.17.4 +2.17.3 Modified: branches/SuSE-Code-11-Branch/reipl/package/yast2-reipl.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/package/yast2-reipl.changes (original) +++ branches/SuSE-Code-11-Branch/reipl/package/yast2-reipl.changes Mon Feb 9 10:57:00 2009 @@ -1,10 +1,4 @@ ------------------------------------------------------------------- -Mon Feb 9 09:48:24 CET 2009 - jsrain(a)suse.cz - -- more rebooting fixes from IBM (bnc #471522) -- 2.17.4 - -------------------------------------------------------------------- Fri Feb 6 11:28:36 CET 2009 - jsrain(a)suse.cz - fixed rebooting (bnc #471522) Modified: branches/SuSE-Code-11-Branch/reipl/src/Reipl.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/src… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/src/Reipl.ycp (original) +++ branches/SuSE-Code-11-Branch/reipl/src/Reipl.ycp Mon Feb 9 10:57:00 2009 @@ -137,8 +137,7 @@ // "method": "ccw", // "ccw": $[ // "device": "0.0.4711", -// "loadparm": "", -// "parm": "" /* SLES 11 and z/VM only */ +// "loadparm": "" // ], // "fcp": $[ // "device": "0.0.4711", @@ -185,7 +184,6 @@ y2error ("Missing loadparm under %1", ccw_directory); return false; } - // don't check for "parm" since it might not be there under zLPAR } if (fcp_exists) { @@ -365,13 +363,12 @@ } /** - * Returns the reipl configuration passed in with what it should be for the detected + * Modifys the reipl configuration passed in with what it should be for the detected * boot partition. - * @param configuration an old configuration. - * @return a map of the new target configuration. + * @param configuration the current configuration. + * @return a map of the new configuration. */ global map <string, any> ModifyReiplWithBootPartition (map <string, any> configuration) { - // get target information list<string> uParts = FindBootPartition (); if (uParts == nil) { @@ -383,7 +380,12 @@ if (size (uParts) == 2) { if (uParts[0]:"" == "ccw") { + if (ccw_exists) { fCCW = true; + } + else { + y2error ("ModifyReiplWithBootPartition: udevPath uses ccw but ccw is not implemented!"); + } } else { y2error ("ModifyReiplWithBootPartition: size of uParts is 2, but first word is not ccw!"); @@ -391,7 +393,12 @@ } else if (size (uParts) == 4) { if (uParts[0]:"" == "zfcp") { + if (fcp_exists) { fFCP = true; + } + else { + y2error ("ModifyReiplWithBootPartition: udevPath uses fcp but fcp is not implemented!"); + } } else { y2error ("ModifyReiplWithBootPartition: size of uParts is 4, but format is not what we expect"); @@ -401,29 +408,45 @@ y2error ("ModifyReiplWithBootPartition: size of uParts is not 2 or 4"); } - // overwrite parts of configuration map with target values if (fCCW) { configuration["method"] = "ccw"; map ccw_map = (map)configuration["ccw"]:nil; + + if (ccw_map == nil) { + y2error ("ModifyReiplWithBootPartition: ccw does not exist in configuration"); + + configuration = nil; + } + else { ccw_map["device"] = uParts[1]:""; ccw_map["loadparm"] = ""; - //ccw_map["parm"] = ""; /* SLES 11 and z/VM only */ // read only + configuration["ccw"] = ccw_map; - y2milestone ("ModifyReiplWithBootPartition: modified ccw map"); + } } else if (fFCP) { configuration["method"] = "fcp"; map fcp_map = (map)configuration["fcp"]:nil; + + if (fcp_map == nil) { + y2error ("ModifyReiplWithBootPartition: ccw does not exist in configuration"); + + configuration = nil; + } + else { fcp_map["device"] = uParts[1]:""; fcp_map["wwpn"] = uParts[2]:""; fcp_map["lun"] = uParts[3]:""; - fcp_map["bootprog"] = "0"; - fcp_map["br_lba"] = "0"; + fcp_map["bootprog"] = ""; + fcp_map["br_lba"] = ""; + configuration["fcp"] = fcp_map; - y2milestone ("ModifyReiplWithBootPartition: modified fcp map"); + } } else { - y2error ("ModifyReiplWithBootPartition: Should not be here, configuration unmodified!"); + y2error ("ModifyReiplWithBootPartition: Should not be here!"); + + configuration = nil; } return configuration; @@ -435,44 +458,50 @@ */ global map <string, any> ReadState () { map <string, any> configuration = $[]; - configuration["ccw"] = $[ - "device": "", - "loadparm": "", - "parm": "" /* SLES 11 and z/VM only */ - ]; - configuration["fcp"] = $[ - "device": "", - "wwpn": "", - "lun": "", - "bootprog": "", - "br_lba": "" - ]; if (!SanityCheck ()) { y2error ("Reipl::Read: SanityCheck failed!"); - // Popup::Error (_("This machine does not support reipl!")); + /* Popup::Error (_("This machine does not support reipl!")); */ /* Don't bother the user, just silently do shutdown in the end. Especially, since this would currently popup three times during installation. */ - return configuration; + return nil; } if (ccw_exists) { + if (configuration["ccw"]:nil == nil) { + configuration["ccw"] = $[ + "device": "", + "loadparm": "" + ]; + } + map ccw_map = (map)configuration["ccw"]:nil; ccw_map["device"] = deletechars ((string)SCR::Read (.target.string, ccw_directory + "/device"), "\n\r"); ccw_map["loadparm"] = deletechars ((string)SCR::Read (.target.string, ccw_directory + "/loadparm"), "\n\r"); - ccw_map["parm"] = deletechars ((string)SCR::Read (.target.string, ccw_directory + "/parm"), "\n\r"); /* SLES 11 and z/VM only */ configuration["ccw"] = ccw_map; } else { - y2warning ("Reipl::Read: ccw is not configured."); + y2error ("Reipl::Read: ccw is not configured."); + + configuration["ccw"] = nil; } if (fcp_exists) { + if (configuration["fcp"]:nil == nil) { + configuration["fcp"] = $[ + "device": "", + "wwpn": "", + "lun": "", + "bootprog": "", + "br_lba": "" + ]; + } + map fcp_map = (map)configuration["fcp"]:nil; fcp_map["device"] = deletechars ((string)SCR::Read (.target.string, fcp_directory + "/device"), "\n\r"); @@ -484,7 +513,7 @@ configuration["fcp"] = fcp_map; } else { - y2warning ("Reipl::Read: fcp is not configured."); + configuration["fcp"] = nil; } configuration["method"] = deletechars ((string)SCR::Read (.target.string, reipl_directory + "/reipl_type"), "\n\r"); @@ -521,6 +550,11 @@ y2milestone ("Reipl::WriteState: writing out method %1", configuration["method"]:""); SCR::Write (.target.string, reipl_directory + "/reipl_type", (string)configuration["method"]:nil); + /* + I see a difference between the value written to the log and written to sysfs: + configuration["method"]:"" <===> (string)configuration["method"]:nil + But that's probably OK here and not the reason for the obvious bug in the y2log. + */ } if (ccw_exists) { @@ -556,7 +590,6 @@ rc = false; } - } else { y2error ("Reipl::WriteState: ccw_map is nil!"); @@ -662,8 +695,7 @@ map ccwIn = (map)settings["ccw"]:$[]; map ccwOut = $[ "device": "", - "loadparm": "", - "parm": "" /* SLES 11 and z/VM only */ + "loadparm": "" ]; if (ccwIn["device"]:nil != nil) { @@ -672,10 +704,6 @@ if (ccwIn["loadparm"]:nil != nil) { ccwOut["loadparm"] = ccwIn["loadparm"]:nil; } - /* SLES 11 and z/VM only */ - if (ccwIn["parm"]:nil != nil) { - ccwOut["parm"] = ccwIn["parm"]:nil; - } imported["ccw"] = ccwOut; } Modified: branches/SuSE-Code-11-Branch/reipl/src/inst_reiplauto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/src… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/src/inst_reiplauto.ycp (original) +++ branches/SuSE-Code-11-Branch/reipl/src/inst_reiplauto.ycp Mon Feb 9 10:57:00 2009 @@ -65,13 +65,14 @@ boolean rc = true; - map <string, any> configuration = Reipl::ReadState (); + map <string, any> oldConfiguration = Reipl::ReadState (); + map <string, any> newConfiguration = nil; - if (configuration != nil) { - configuration = Reipl::ModifyReiplWithBootPartition (configuration); + if (oldConfiguration != nil) { + newConfiguration = Reipl::ModifyReiplWithBootPartition (oldConfiguration); - if (configuration != nil) { - Reipl::WriteState (configuration); + if (newConfiguration != nil) { + Reipl::WriteState (newConfiguration); } else { y2error ("Could not modify reipl configuration"); Modified: branches/SuSE-Code-11-Branch/reipl/src/reipl_bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/src… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/src/reipl_bootloader_finish.ycp (original) +++ branches/SuSE-Code-11-Branch/reipl/src/reipl_bootloader_finish.ycp Mon Feb 9 10:57:00 2009 @@ -20,58 +20,42 @@ textdomain "reipl"; - boolean different = true; + boolean different = false; string ipl_msg = ""; // Other architectures do not support it if (Arch::s390 ()) { map <string, any> oldConfiguration = Reipl::ReadState (); - map <string, any> newConfiguration = Reipl::ReadState (); + map <string, any> newConfiguration = oldConfiguration; if (oldConfiguration != nil) { - newConfiguration = Reipl::ModifyReiplWithBootPartition (newConfiguration); + newConfiguration = Reipl::ModifyReiplWithBootPartition (oldConfiguration); map oldCcwMap = (map)oldConfiguration["ccw"]:nil; map newCcwMap = (map)newConfiguration["ccw"]:nil; map oldFcpMap = (map)oldConfiguration["fcp"]:nil; map newFcpMap = (map)newConfiguration["fcp"]:nil; - different = (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b") - || (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b") - || (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b") - || (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b") - || (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b") - || (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b") - || (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b") - || (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b") - || (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"); - - y2milestone("(oldConfiguration['method']:'a' != newConfiguration['method']:'b') = %1", (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b")); - y2milestone("(oldCcwMap['device']:'a' != newCcwMap['device']:'b') = %1", (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b")); - y2milestone("(oldCcwMap['loadparm']:'a' != newCcwMap['loadparm']:'b') = %1", (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b")); - y2milestone("(oldCcwMap['parm']:'a' != newCcwMap['parm']:'b') = %1", (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b")); - y2milestone("(oldFcpMap['device']:'a' != newFcpMap['device']:'b') = %1", (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b")); - y2milestone("(oldFcpMap['wwpn']:'a' != newFcpMap['wwpn']:'b') = %1", (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b")); - y2milestone("(oldFcpMap['lun']:'a' != newFcpMap['lun']:'b') = %1", (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b")); - y2milestone("(oldFcpMap['bootprog']:'a' != newFcpMap['bootprog']:'b') = %1", (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b")); - y2milestone("(oldFcpMap['br_lba']:'a' != newFcpMap['br_lba']:'b') = %1", (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b")); - y2milestone("different = %1", different); + different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" + && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" + && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" + && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" + && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" + && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" + && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" + && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; - y2milestone("newConfiguration['method'] : %1", newConfiguration["method"]:"ERROR"); if (newConfiguration["method"]:"ERROR" == "ccw") { - y2milestone("making ccw ipl text"); string dev = substring (newCcwMap["device"]:"", 4, 4); // TRANSLATORS: part of a shutdown message // %1 is replaced with a device name // Newline at the end is required - ipl_msg = sformat (_(" -After shutdown, reload the system + ipl_msg = sformat (_("After shutdown, reload the system with an IPL from DASD '%1'. "), dev); } else if (newConfiguration["method"]:"ERROR" == "fcp") { - y2milestone("making fcp ipl text"); string dev = substring (newFcpMap["device"]:"", 4, 4); string wwpn = newFcpMap["wwpn"]:""; string lun = newFcpMap["lun"]:""; @@ -81,24 +65,13 @@ // %2 is replaced with a WWPN name // %3 is replaced with a LUN name // Newline at the end is required - ipl_msg = sformat (_(" -After shutdown, reload the system -with an IPL from FCP '%1' -with WWPN '%2' + ipl_msg = sformat (_("After shutdown, reload the system +with an IPL from FCP '%1' with WWPN '%2' and LUN '%3'. "), dev, wwpn, lun); - } else { - y2warning("cannot make ipl text for unknown method"); } } } - y2milestone ("Configuration (reIPL) has been changed: %1", different); - y2milestone ("Configuration (reIPL) generated shutdown dialog box message: %1", ipl_msg); - - map <string, any> ret = $["different":different, "ipl_msg":ipl_msg]; - - y2milestone("ret = %1", ret); - - return ret; -} + return $["different":different, "ipl_msg":ipl_msg]; +} \ No newline at end of file Modified: branches/SuSE-Code-11-Branch/reipl/src/reipl_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/reipl/src… ============================================================================== --- branches/SuSE-Code-11-Branch/reipl/src/reipl_finish.ycp (original) +++ branches/SuSE-Code-11-Branch/reipl/src/reipl_finish.ycp Mon Feb 9 10:57:00 2009 @@ -16,46 +16,33 @@ import "Arch"; import "Reipl"; - boolean different = true; + boolean different = false; // Other architectures do not support it if (Arch::s390 ()) { map <string, any> oldConfiguration = Reipl::ReadState (); - map <string, any> newConfiguration = Reipl::ReadState (); + map <string, any> newConfiguration = oldConfiguration; if (oldConfiguration != nil) { - newConfiguration = Reipl::ModifyReiplWithBootPartition (newConfiguration); + newConfiguration = Reipl::ModifyReiplWithBootPartition (oldConfiguration); map oldCcwMap = (map)oldConfiguration["ccw"]:nil; map newCcwMap = (map)newConfiguration["ccw"]:nil; map oldFcpMap = (map)oldConfiguration["fcp"]:nil; map newFcpMap = (map)newConfiguration["fcp"]:nil; - different = (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b") - || (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b") - || (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b") - || (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b") - || (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b") - || (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b") - || (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b") - || (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b") - || (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"); - - y2milestone("(oldConfiguration['method']:'a' != newConfiguration['method']:'b') = %1", (oldConfiguration["method"]:"a" != newConfiguration["method"]:"b")); - y2milestone("(oldCcwMap['device']:'a' != newCcwMap['device']:'b') = %1", (oldCcwMap["device"]:"a" != newCcwMap["device"]:"b")); - y2milestone("(oldCcwMap['loadparm']:'a' != newCcwMap['loadparm']:'b') = %1", (oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b")); - y2milestone("(oldCcwMap['parm']:'a' != newCcwMap['parm']:'b') = %1", (oldCcwMap["parm"]:"a" != newCcwMap["parm"]:"b")); - y2milestone("(oldFcpMap['device']:'a' != newFcpMap['device']:'b') = %1", (oldFcpMap["device"]:"a" != newFcpMap["device"]:"b")); - y2milestone("(oldFcpMap['wwpn']:'a' != newFcpMap['wwpn']:'b') = %1", (oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b")); - y2milestone("(oldFcpMap['lun']:'a' != newFcpMap['lun']:'b') = %1", (oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b")); - y2milestone("(oldFcpMap['bootprog']:'a' != newFcpMap['bootprog']:'b') = %1", (oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b")); - y2milestone("(oldFcpMap['br_lba']:'a' != newFcpMap['br_lba']:'b') = %1", (oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b")); - y2milestone("different = %1", different); - + different = oldConfiguration["method"]:"a" != newConfiguration["method"]:"b" + && oldCcwMap["device"]:"a" != newCcwMap["device"]:"b" + && oldCcwMap["loadparm"]:"a" != newCcwMap["loadparm"]:"b" + && oldFcpMap["device"]:"a" != newFcpMap["device"]:"b" + && oldFcpMap["wwpn"]:"a" != newFcpMap["wwpn"]:"b" + && oldFcpMap["lun"]:"a" != newFcpMap["lun"]:"b" + && oldFcpMap["bootprog"]:"a" != newFcpMap["bootprog"]:"b" + && oldFcpMap["br_lba"]:"a" != newFcpMap["br_lba"]:"b"; } y2milestone ("Configuration (reIPL) has been changed: %1", different); } return different; -} +} \ No newline at end of file -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55330 - /tags/stable-2_18_0/wagon/
by locilka＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: locilka Date: Mon Feb 9 10:31:24 2009 New Revision: 55330 URL: http://svn.opensuse.org/viewcvs/yast?rev=55330&view=rev Log: Created tag stable-2_18_0 for wagon Added: tags/stable-2_18_0/wagon/ - copied from r55329, trunk/wagon/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55329 - /trunk/storage/storage/src/include/ep-settings.ycp
by kmachalkova＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: kmachalkova Date: Mon Feb 9 10:27:33 2009 New Revision: 55329 URL: http://svn.opensuse.org/viewcvs/yast?rev=55329&view=rev Log: Save settings also when hitting Next in this dialog Modified: trunk/storage/storage/src/include/ep-settings.ycp Modified: trunk/storage/storage/src/include/ep-settings.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-s… ============================================================================== --- trunk/storage/storage/src/include/ep-settings.ycp (original) +++ trunk/storage/storage/src/include/ep-settings.ycp Mon Feb 9 10:27:33 2009 @@ -7,6 +7,7 @@ { textdomain "storage"; + void DestroySettingsPanel(any user_data); list< map<symbol, any> > visible_fields = [ // list entry @@ -138,6 +139,10 @@ StorageSettings::SetDisplayName((symbol) UI::QueryWidget(`id(`display_name), `Value)); UpdateNavigationTree(nil); } + else if (widget == `next) + { + DestroySettingsPanel($[]); + } if (!StorageSettings::GetModified()) { StorageSettings::SetModified(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55328 - /tags/branch-Code-11-2_17_8/wagon/
by locilka＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: locilka Date: Mon Feb 9 10:14:03 2009 New Revision: 55328 URL: http://svn.opensuse.org/viewcvs/yast?rev=55328&view=rev Log: Created tag branch-Code-11-2_17_8 for wagon Added: tags/branch-Code-11-2_17_8/wagon/ - copied from r55327, branches/SuSE-Code-11-Branch/wagon/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55327 - in /trunk/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_congratulate.ycp src/config/online_migration.xml
by locilka＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: locilka Date: Mon Feb 9 10:12:54 2009 New Revision: 55327 URL: http://svn.opensuse.org/viewcvs/yast?rev=55327&view=rev Log: - Added new wagon_congratulate client - an envelope that loads the product control file with congratulate text and calls inst_congratulate client that show that text (bnc #445974). - 2.18.0 Added: trunk/wagon/src/clients/wagon_congratulate.ycp Modified: trunk/wagon/VERSION trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/config/online_migration.xml Modified: trunk/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=55327&r1=55326… ============================================================================== --- trunk/wagon/VERSION (original) +++ trunk/wagon/VERSION Mon Feb 9 10:12:54 2009 @@ -1 +1 @@ -2.17.7 +2.18.0 Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Feb 9 10:12:54 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Feb 9 10:10:05 CET 2009 - locilka(a)suse.cz + +- Added new wagon_congratulate client - an envelope that loads the + product control file with congratulate text and calls + inst_congratulate client that show that text (bnc #445974). +- 2.18.0 + +------------------------------------------------------------------- Fri Dec 5 14:25:45 CET 2008 - locilka(a)suse.cz - New control.rnc/rng for control file validation (bnc #455994). Added: trunk/wagon/src/clients/wagon_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_congratu… ============================================================================== --- trunk/wagon/src/clients/wagon_congratulate.ycp (added) +++ trunk/wagon/src/clients/wagon_congratulate.ycp Mon Feb 9 10:12:54 2009 @@ -0,0 +1,48 @@ +/** + * File: + * clients/wagon_congratulate.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id:$ + * + */ + +{ + // FIXME: add own congratulations dialog to the wagon control file + + import "ProductControl"; + import "ProductFeatures"; + + // BNC #445974 + // Don't use custom control file, only the base-product one has + // a congratulations text defined + string custom_workflow_file = ""; + + if (ProductControl::custom_control_file != nil && ProductControl::custom_control_file != "") { + custom_workflow_file = ProductControl::custom_control_file; + ProductControl::custom_control_file = ""; + ProductControl::Init(); + // Disable AutoYaST Cloning check-box + ProductFeatures::SetBooleanFeature ("globals", "enable_clone", false); + ProductControl::clone_modules = []; + y2milestone ("X: %1", ProductFeatures::GetBooleanFeature("globals", "enable_clone")); + } + + symbol ret = (symbol) WFM::CallFunction ("inst_congratulate", WFM::Args()); + + // Re-use the previous custom control file + if (custom_workflow_file != nil && custom_workflow_file != "") { + ProductControl::custom_control_file = custom_workflow_file; + ProductControl::Init(); + } + + return ret; +} Modified: trunk/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migratio… ============================================================================== --- trunk/wagon/src/config/online_migration.xml (original) +++ trunk/wagon/src/config/online_migration.xml Mon Feb 9 10:12:54 2009 @@ -292,7 +292,7 @@ <module> <label>Finished</label> <name>finished</name> - <execute>inst_congratulate</execute> + <execute>wagon_congratulate</execute> </module> </modules> </workflow> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55326 - in /branches/SuSE-Code-11-Branch/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_congratulate.ycp src/config/online_migration.xml
by locilka＠svn.opensuse.org 09 Feb '09

09 Feb '09

Author: locilka Date: Mon Feb 9 10:12:37 2009 New Revision: 55326 URL: http://svn.opensuse.org/viewcvs/yast?rev=55326&view=rev Log: - Added new wagon_congratulate client - an envelope that loads the product control file with congratulate text and calls inst_congratulate client that show that text (bnc #445974). - 2.17.8 Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_congratulate.ycp Modified: branches/SuSE-Code-11-Branch/wagon/VERSION branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml Modified: branches/SuSE-Code-11-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-Branch/wagon/VERSION Mon Feb 9 10:12:37 2009 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Mon Feb 9 10:12:37 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Feb 9 10:10:05 CET 2009 - locilka(a)suse.cz + +- Added new wagon_congratulate client - an envelope that loads the + product control file with congratulate text and calls + inst_congratulate client that show that text (bnc #445974). +- 2.17.8 + +------------------------------------------------------------------- Fri Dec 5 14:25:45 CET 2008 - locilka(a)suse.cz - New control.rnc/rng for control file validation (bnc #455994). Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_congratulate.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_congratulate.ycp Mon Feb 9 10:12:37 2009 @@ -0,0 +1,48 @@ +/** + * File: + * clients/wagon_congratulate.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * Summary: + * Online Migration Tool + * + * $Id:$ + * + */ + +{ + // FIXME: add own congratulations dialog to the wagon control file + + import "ProductControl"; + import "ProductFeatures"; + + // BNC #445974 + // Don't use custom control file, only the base-product one has + // a congratulations text defined + string custom_workflow_file = ""; + + if (ProductControl::custom_control_file != nil && ProductControl::custom_control_file != "") { + custom_workflow_file = ProductControl::custom_control_file; + ProductControl::custom_control_file = ""; + ProductControl::Init(); + // Disable AutoYaST Cloning check-box + ProductFeatures::SetBooleanFeature ("globals", "enable_clone", false); + ProductControl::clone_modules = []; + y2milestone ("X: %1", ProductFeatures::GetBooleanFeature("globals", "enable_clone")); + } + + symbol ret = (symbol) WFM::CallFunction ("inst_congratulate", WFM::Args()); + + // Re-use the previous custom control file + if (custom_workflow_file != nil && custom_workflow_file != "") { + ProductControl::custom_control_file = custom_workflow_file; + ProductControl::Init(); + } + + return ret; +} Modified: branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml Mon Feb 9 10:12:37 2009 @@ -292,7 +292,7 @@ <module> <label>Finished</label> <name>finished</name> - <execute>inst_congratulate</execute> + <execute>wagon_congratulate</execute> </module> </modules> </workflow> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0