March 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56478 - /tags/branch-Code-11-2_17_77/
by mzugec＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: mzugec Date: Tue Mar 31 10:48:00 2009 New Revision: 56478 URL: http://svn.opensuse.org/viewcvs/yast?rev=56478&view=rev Log: Created tag branch-Code-11-2_17_77 Added: tags/branch-Code-11-2_17_77/ -- 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] r56477 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: mzugec Date: Tue Mar 31 10:47:51 2009 New Revision: 56477 URL: http://svn.opensuse.org/viewcvs/yast?rev=56477&view=rev Log: tun/tap device - don't remove default gw (bnc#483233) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/lan/address.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Tue Mar 31 10:47:51 2009 @@ -1 +1 @@ -2.17.76 +2.17.77 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Tue Mar 31 10:47:51 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 31 10:46:35 CEST 2009 - mzugec(a)suse.cz + +- tun/tap device - don't remove default gw (bnc#483233) +- 2.17.77 + +------------------------------------------------------------------- Sat Feb 28 16:32:25 CET 2009 - jsrain(a)suse.cz - fixed identification of qeth interfaces (bnc #479481) Modified: branches/SuSE-Code-11-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/lan/address.ycp Tue Mar 31 10:47:51 2009 @@ -755,6 +755,13 @@ "IFCFGTYPE": LanItems::type, "IFCFGID": LanItems::device, ]; + + string drvtype = DriverType (settings["IFCFGTYPE"]:""); + + boolean is_ptp = drvtype == "ctc" || drvtype == "iucv"; + // TODO: dynamic for dummy. or add dummy from outside? + boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; + if (contains(["tun", "tap"], LanItems::type)) { settings = $[ @@ -765,16 +772,10 @@ "TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner, "TUNNEL_SET_GROUP" : LanItems::tunnel_set_group ]; + } else { + if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; } - string drvtype = DriverType (settings["IFCFGTYPE"]:""); - - boolean is_ptp = drvtype == "ctc" || drvtype == "iucv"; - // TODO: dynamic for dummy. or add dummy from outside? - boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; - - if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; - // #65524 if (LanItems::operation == `add && force_static_ip) { -- 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] r56476 - /trunk/ycp-ui-bindings/examples/IntField3.ycp
by gs＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: gs Date: Tue Mar 31 10:45:26 2009 New Revision: 56476 URL: http://svn.opensuse.org/viewcvs/yast?rev=56476&view=rev Log: add test case for ncurses bug #488757 Added: trunk/ycp-ui-bindings/examples/IntField3.ycp Added: trunk/ycp-ui-bindings/examples/IntField3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/IntFiel… ============================================================================== --- trunk/ycp-ui-bindings/examples/IntField3.ycp (added) +++ trunk/ycp-ui-bindings/examples/IntField3.ycp Tue Mar 31 10:45:26 2009 @@ -0,0 +1,14 @@ +{ + // `IntField in combination with `HWeight + // (test case for ncurses bug #488757) + UI::OpenDialog( + `HBox( + `HWeight(1, + `IntField( "short", 0, 10000, 50)), + `HWeight(1, + `PushButton(`opt(`default), "long label")) + ) + ); + UI::UserInput(); + UI::CloseDialog(); +} -- 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] r56475 - /trunk/mail/package/yast2-mail.changes
by varkoly＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: varkoly Date: Tue Mar 31 10:41:55 2009 New Revision: 56475 URL: http://svn.opensuse.org/viewcvs/yast?rev=56475&view=rev Log: add missed change log Modified: trunk/mail/package/yast2-mail.changes Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Tue Mar 31 10:41:55 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 31 10:41:00 CEST 2009 - varkoly(a)suse.de + +- If starting the virus scanner freshclam have to be started also + +------------------------------------------------------------------- Mon Mar 9 22:15:36 CET 2009 - varkoly(a)suse.de - bnc#483639 - yast2 mail server's master.cf parser do not writes some lines -- 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] r56474 - /tags/stable-2_17_5/mail/
by varkoly＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: varkoly Date: Tue Mar 31 10:40:37 2009 New Revision: 56474 URL: http://svn.opensuse.org/viewcvs/yast?rev=56474&view=rev Log: Created tag stable-2_17_5 for mail Added: tags/stable-2_17_5/mail/ - copied from r56473, trunk/mail/ -- 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] r56473 - /trunk/mail/VERSION
by varkoly＠svn.opensuse.org 31 Mar '09

31 Mar '09

Author: varkoly Date: Tue Mar 31 10:40:25 2009 New Revision: 56473 URL: http://svn.opensuse.org/viewcvs/yast?rev=56473&view=rev Log: new version Modified: trunk/mail/VERSION Modified: trunk/mail/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/VERSION?rev=56473&r1=56472&… ============================================================================== --- trunk/mail/VERSION (original) +++ trunk/mail/VERSION Tue Mar 31 10:40:25 2009 @@ -1 +1 @@ -2.17.4 +2.17.5 -- 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] r56472 - /trunk/mail/src/YaPI/MailServer.pm
by varkoly＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: varkoly Date: Mon Mar 30 20:07:23 2009 New Revision: 56472 URL: http://svn.opensuse.org/viewcvs/yast?rev=56472&view=rev Log: freshclam have to enabled too Modified: trunk/mail/src/YaPI/MailServer.pm Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=… ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Mon Mar 30 20:07:23 2009 @@ -3088,8 +3088,10 @@ move("$aconf.new",$aconf); move("$cconf.new",$cconf); Service->Enable('amavis'); + Service->Enable('freshclam'); Service->Enable('clamd'); Service->Start('amavis'); + Service->Start('freshclam'); Service->Start('clamd'); return ""; } -- 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] r56471 - in /branches/tmp/juhliarik/bootloader-UIrefactor/src: modules/BootPOWERLILO.ycp ppc/ppc_dialogs.ycp ppc/ppc_options.ycp routines/section_widgets.ycp
by juhliarik＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: juhliarik Date: Mon Mar 30 17:37:25 2009 New Revision: 56471 URL: http://svn.opensuse.org/viewcvs/yast?rev=56471&view=rev Log: added updated for PPC bootloader UI Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootPOWERLILO.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootPOWERLILO.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/modules/BootPOWERLILO.ycp Mon Mar 30 17:37:25 2009 @@ -43,7 +43,8 @@ * read my dialogs */ include "bootloader/routines/popups.ycp"; // define confirmSectionDeletePopup -include "bootloader/generic/dialogs.ycp"; +//include "bootloader/generic/dialogs.ycp"; + @@ -62,6 +63,9 @@ // map available of 41 PReP partitions, used on iSeries and CHRP global list<string> prep_boot_partitions = []; +// map available HFS partitions, used on PMac +global list<string> pmac_boot_partitions = []; + // PReP boot partitions that were proposed by partitioner to install BL global list<string> install_prep_boot_partitions = []; @@ -559,7 +563,7 @@ ); }); y2milestone ("Detected pmac boot partitions: %1", boot_partitions); - + pmac_boot_partitions = boot_partitions; if (selected_boot_partition == "") { selected_boot_partition = boot_partitions[0]:""; @@ -917,7 +921,7 @@ boolean ret = BootCommon::Read (false, avoid_reading_device_map); y2milestone (":: Read globals: %1", BootCommon::globals); - importMetaData(); + //importMetaData(); return ret; } @@ -992,7 +996,7 @@ if (flush) ret = ret && BootCommon::CommitSettings (); - importMetaData(); + //importMetaData(); BootCommon::WriteToSysconf(false); return ret; @@ -1302,7 +1306,7 @@ "summary" : Summary, "update" : Update, "write" : Write, - "widgets" : genericWidgets, + "widgets" : ppcWidgets, "wizard_sequencer" : WizardSequenzer, "dialogs" : Dialogs, "section_types" : ppc_section_types, @@ -1337,7 +1341,7 @@ y2debug("Initialized descriptions to %1", BootCommon::descriptions); BootCommon::InitializeLibrary (false, "ppc"); - importMetaData(); + //importMetaData(); } /** Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_dialogs.ycp Mon Mar 30 17:37:25 2009 @@ -27,7 +27,50 @@ include "bootloader/ppc/ppc_options.ycp"; +list<string> arch_widget_names = ["append", "initrd", "root", "timeout", "activate"]; +term arch_term = `Empty(); + +void PPCArchDep() +{ + string board_type = getBoardType (); + + switch(board_type) { + case ("prep"): + arch_term = `Frame ( _("PReP Specific Settings"),`HBox(`HSpacing(1),`VBox( + "bootfolder" + ))); + arch_widget_names = ["append", "initrd", "root", "timeout", "activate", + "bootfolder"]; + break; + + case ("pmac"): + arch_term = `Frame ( _("Mac Specific Settings"),`HBox(`HSpacing(1),`VBox( + `Left("no_os_chooser"), + `Left("macos_timeout"), + "bootfolder" + + ))); + arch_widget_names = ["append", "initrd", "root", "timeout", "activate", + "no_os_chooser", "bootfolder", "macos_timeout"]; + break; + + case ("iseries"): + + break; + default: + arch_term = `Frame ( _("CHRP Specific Settings"),`HBox(`HSpacing(1),`VBox( + `Left("force_fat"), + `Left("force"), + `Left("clone") + ))); + arch_widget_names = ["append", "initrd", "root", "timeout", "activate", + "force", "force_fat", "clone"]; + + break; + + } +} /** * Run dialog to adjust installation on i386 and AMD64 @@ -35,20 +78,22 @@ */ symbol PPCDetailsDialog () { y2milestone ("Running ppc loader details dialog"); + PPCArchDep(); - term contents = `VBox ( + term contents = `HBox(`HSpacing(1), `VBox ( `Frame ( _("Global Section Options"),`HBox(`HSpacing(1),`VBox( `Left("append"), "initrd", - `Left("root") + `Left("root"), + "timeout", + `Left("activate") ))), - "timeout", - "default", - "activate", - `VStretch () - ); + `VSpacing(1), + // add board specific settings + arch_term + )); - list<string> widget_names = ["append", "initrd", "root", "timeout", "default", "activate",]; + list<string> widget_names = arch_widget_names; return CWM::ShowAndRun ($[ "widget_descr": PPCOptions(), @@ -61,6 +106,51 @@ ]); } +map<string,any> ppcBootLoaderLocationWidget () +{ + + string board_type = getBoardType (); + + switch(board_type) { + case ("prep"): + return BootPReP(); + break; + + case ("pmac"): + return BootPMAC(); + break; + + case ("iseries"): + return $[]; + break; + default: + + return BootCHRP(); + break; + + } + +} + + +/** + * Cache for genericWidgets function + */ +map<string,map<string,any> > _ppc_widgets = nil; + +/** + * Get generic widgets + * @return a map describing all generic widgets + */ +global map<string,map<string,any> > ppcWidgets () { + if (_ppc_widgets == nil) + { + _ppc_widgets = $[ + "loader_location" : ppcBootLoaderLocationWidget (), + ]; + } + return _ppc_widgets; +} } \ No newline at end of file Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/ppc_options.ycp Mon Mar 30 17:37:25 2009 @@ -23,7 +23,6 @@ include "bootloader/ppc/helps.ycp"; - // FIXME: // add widget "boot" /* @@ -32,12 +31,6 @@ : "select:PPC Boot loader location:", */ -// FIXME: -// add widget "clone" CHRP -/* - $go->{clone} = "selectdevice:Partition for boot loader duplication::" . ":" . $boot_partitions; - -*/ // add widget "boot_chrp_custom" CHRP /* @@ -45,39 +38,232 @@ */ -// FIXME: -// add widget "boot_prep_custom" PREP -/* -$go->{boot_prep_custom} - = "selectdevice:PReP partition::" . -$boot_partitions; -*/ +void InitDuplicatePartition(string widget) { + list <string> devices = prep_boot_partitions; + if (size(devices) != 0) + { + UI::ChangeWidget (`id ("clone"), `Items, devices); + } + UI::ChangeWidget (`id ("clone"), `Value, BootCommon::globals["clone"]:""); +} +void StoreDuplicatePartition (string widget, map event) { -// FIXME: -// add widget "boot_slot" iSERIES + BootCommon::globals["clone"] + = (splitstring( (string)UI::QueryWidget (`id ("clone"), `Value), " "))[0]:""; + +} -/* - $go->{boot_slot} = "select:Write to boot slot:B:" . "A:B:C:D"; -*/ -// add widget "boot_iseries_custom" iSERIES +map<string,any> DuplicatePartition(){ + return $[ + "widget" : `combobox, + "label" : _("Partition for Boot Loader &Duplication"), + "items" : [""], + "opt" : [`editable, `hstretch], + "help" : ppc_help_messages["clone"]:"", + "init" : InitDuplicatePartition, + "store" : StoreDuplicatePartition, + ]; +} -/* -$go->{boot_iseries_custom} -*/ +void InitBootPMAC(string widget) { + list <string> devices = pmac_boot_partitions; + if (size(devices) != 0) + { + UI::ChangeWidget (`id ("boot_pmac_custom"), `Items, devices); + } + + if (BootCommon::globals["boot_pmac_custom"]:"" == "") + { + UI::ChangeWidget (`id ("enable_pmac"), `Value, false); + UI::ChangeWidget (`id ("boot_pmac_custom"), `Enabled, false); + } else { + UI::ChangeWidget (`id ("enable_pmac"), `Value, true); + UI::ChangeWidget (`id ("boot_pmac_custom"), `Enabled, true); + UI::ChangeWidget (`id ("boot_pmac_custom"), `Value, BootCommon::globals["boot_pmac_custom"]:""); + } +} + +void StoreBootPMAC (string widget, map event) { + if ((boolean) UI::QueryWidget(`id("enable_pmac"), `Value)) + { + BootCommon::globals["boot_pmac_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_pmac_custom"), `Value), " "))[0]:""; + } else { + BootCommon::globals["boot_pmac_custom"] = ""; + } +} + + +symbol HandleBootPMAC (string key, map event) { + any ret = event["ID"]:nil; + if (ret == "enable_pmac") { + UI::ChangeWidget (`id ("boot_pmac_custom"), `Enabled, + (boolean) UI::QueryWidget(`id("enable_pmac"), `Value)); + } +} + +map<string,any> BootPMAC(){ + return $[ + "widget" : `custom, + "custom_widget" : `VBox( + `Frame ( _("Boot Loader Location"), `VBox( + `Left(`HBox(`HSpacing(1),`VBox( + `Left(`CheckBox(`id("enable_pmac"), `opt(`notify), _("HFS Boot &Partition"))), + `Left(`ComboBox(`id("boot_pmac_custom"), `opt(`editable, `hstretch), "", [""])) + ))) + ))), + "help" : ppc_help_messages["boot_pmac_custom"]:"", + "init" : InitBootPMAC, + "handle" : HandleBootPMAC, + "store" : StoreBootPMAC, + ]; +} + + +void InitBootCHRP(string widget) { + list <string> devices = prep_boot_partitions; + if (size(devices) != 0) + { + UI::ChangeWidget (`id ("boot_chrp_custom"), `Items, devices); + } + + if (BootCommon::globals["boot_chrp_custom"]:"" == "") + { + UI::ChangeWidget (`id ("enable_chrp"), `Value, false); + UI::ChangeWidget (`id ("boot_chrp_custom"), `Enabled, false); + } else { + UI::ChangeWidget (`id ("enable_chrp"), `Value, true); + UI::ChangeWidget (`id ("boot_chrp_custom"), `Enabled, true); + UI::ChangeWidget (`id ("boot_chrp_custom"), `Value, BootCommon::globals["boot_chrp_custom"]:""); + } +} + +void StoreBootCHRP (string widget, map event) { + if ((boolean) UI::QueryWidget(`id("enable_chrp"), `Value)) + { + BootCommon::globals["boot_chrp_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_chrp_custom"), `Value), " "))[0]:""; + } else { + BootCommon::globals["boot_chrp_custom"] = ""; + } +} + + +symbol HandleBootCHRP (string key, map event) { + any ret = event["ID"]:nil; + if (ret == "enable_chrp") { + UI::ChangeWidget (`id ("boot_chrp_custom"), `Enabled, + (boolean) UI::QueryWidget(`id("enable_chrp"), `Value)); + } +} + +map<string,any> BootCHRP(){ + return $[ + "widget" : `custom, + "custom_widget" : `VBox( + `Frame ( _("Boot Loader Location"), `VBox( + `Left(`HBox(`HSpacing(1),`VBox( + `Left(`CheckBox(`id("enable_chrp"), `opt(`notify), _("&PReP or FAT Partition"))), + `Left(`ComboBox(`id("boot_chrp_custom"), `opt(`editable, `hstretch), "", [""])) + ))) + ))), + "help" : ppc_help_messages["boot_chrp_custom"]:"", + "init" : InitBootCHRP, + "handle" : HandleBootCHRP, + "store" : StoreBootCHRP, + ]; +} + + +void InitBootPReP(string widget) { + list <string> devices = prep_boot_partitions; + if (size(devices) != 0) + { + UI::ChangeWidget (`id ("boot_prep_custom"), `Items, devices); + } + + if (BootCommon::globals["boot_prep_custom"]:"" == "") + { + UI::ChangeWidget (`id ("enable_prep"), `Value, false); + UI::ChangeWidget (`id ("boot_prep_custom"), `Enabled, false); + } else { + UI::ChangeWidget (`id ("enable_prep"), `Value, true); + UI::ChangeWidget (`id ("boot_prep_custom"), `Enabled, true); + UI::ChangeWidget (`id ("boot_prep_custom"), `Value, BootCommon::globals["boot_prep_custom"]:""); + } +} + +void StoreBootPReP (string widget, map event) { + if ((boolean) UI::QueryWidget(`id("enable_prep"), `Value)) + { + BootCommon::globals["boot_prep_custom"] + = (splitstring( (string)UI::QueryWidget (`id ("boot_prep_custom"), `Value), " "))[0]:""; + } else { + BootCommon::globals["boot_prep_custom"] = ""; + } +} + + +symbol HandleBootPReP (string key, map event) { + any ret = event["ID"]:nil; + if (ret == "enable_prep") { + UI::ChangeWidget (`id ("boot_prep_custom"), `Enabled, + (boolean) UI::QueryWidget(`id("enable_prep"), `Value)); + } +} + +map<string,any> BootPReP(){ + return $[ + "widget" : `custom, + "custom_widget" : `VBox( + `Frame ( _("Boot Loader Location"), `VBox( + `Left(`HBox(`HSpacing(1),`VBox( + `Left(`CheckBox(`id("enable_prep"), `opt(`notify), _("&PReP partitions"))), + `Left(`ComboBox(`id("boot_prep_custom"), `opt(`editable, `hstretch), "", [""])) + ))) + ))), + "help" : ppc_help_messages["boot_prep_custom"]:"", + "init" : InitBootPReP, + "handle" : HandleBootPReP, + "store" : StoreBootPReP, + ]; +} -// FIXME: -// add widget "boot_pmac_custom" PMAC /* - $go->{boot_pmac_custom} - = "select:HFS boot partition::" . -$boot_partitions; +void InitBootPMac(string widget) { + list <string> devices = pmac_boot_partitions; + if (device != "") + { + UI::ChangeWidget (`id (widget), `Items, [device]); + } + UI::ChangeWidget (`id (widget), `Value, + ([device]([BootCommon::globals[widget]:""]))[0]:""); +} + +void StoreBootPMac (string widget, map event) { +BootCommon::globals[widget] + = (splitstring( (string)UI::QueryWidget (`id (widget), `Value), " "))[0]:""; +} + +map<string,any> BootPMac(){ + return $[ + "widget" : `combobox, + "label" : _("HF&S boot partition"), + "items" : [], + "opt" : [`editable], + "help" : ppc_help_messages["boot_pmac_custom"]:"", + "init" : InitBootPMac, + "store" : StoreBootPMac, + ]; +} */ + void BootInit(string widget){ UI::ChangeWidget(`id(widget+"_enabled"),`Value, haskey(BootCommon::globals,widget)); UI::ChangeWidget(`id(widget), `Enabled, haskey(BootCommon::globals,widget)); @@ -121,7 +307,7 @@ * @return a map the description of the tabs */ map<string,any> PPCBootWidget(){ - string from; + string from = ""; if (Arch::board_chrp()) from = "boot_chrp_custom"; else if (Arch::board_iseries()) @@ -144,17 +330,17 @@ map<string,map<string,any> > ppc_specific = $[ "append" : CommonInputFieldWidget(_("Global Append &String of Options to Kernel Command Line"), ppc_help_messages["append"]:""), - "default" : CommonInputFieldWidget(_("&Default Boot Section"), - ppc_help_messages["default"]:""), "initrd" : CommonInputFieldBrowseWidget(_("Nam&e of Default Initrd File"), ppc_help_messages["initrd"]:"", "initrd"), "root" : CommonInputFieldWidget(_("Set Default &Root Filesystem"), ppc_help_messages["root"]:""), - "activate": CommonCheckboxWidget(_("Change Boot Device in &NV-RAM"), elilo_help_messages["activate"]:""), + "activate": CommonCheckboxWidget(_("Change Boot Device in &NV-RAM"), ppc_help_messages["activate"]:""), // CHRP - "force_fat": CommonCheckboxWidget(_("&Always Boot from FAT Partition"), elilo_help_messages["force_fat"]:""), + "force_fat": CommonCheckboxWidget(_("&Always Boot from FAT Partition"), ppc_help_messages["force_fat"]:""), + + "force" : CommonCheckboxWidget(_("&Install Boot Loader Even on Errors"), ppc_help_messages["force"]:""), - "force" : CommonCheckboxWidget(_("&Install Boot Loader Even on Errors"), elilo_help_messages["force"]:""), + "clone" : DuplicatePartition(), // end CHRP // PREP also for PMAC @@ -163,12 +349,10 @@ // end PREP - // iSERIES - - // end iSERIES - // PMAC - "no_os_chooser" : CommonCheckboxWidget(_("Do not use OS-chooser") elilo_help_messages["no_os_chooser"]:""), + "no_os_chooser" : CommonCheckboxWidget(_("Do not use OS-chooser"), ppc_help_messages["no_os_chooser"]:""), + "macos_timeout" : CommonIntFieldWidget (_("Timeout in Seconds for MacOS/Linux"), + ppc_help_messages["macos_timeout"]:"",0,60), // end PMAC ]; Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Mon Mar 30 17:37:25 2009 @@ -53,6 +53,8 @@ } } } + + return true; } boolean validate_initrd(string widget, map event){ @@ -65,6 +67,7 @@ } } } + return true; } map<string,boolean (string, map)> validation_map = $[ -- 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] r56470 - /tags/stable-2_18_3/pkg-bindings/
by lslezak＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: lslezak Date: Mon Mar 30 17:00:18 2009 New Revision: 56470 URL: http://svn.opensuse.org/viewcvs/yast?rev=56470&view=rev Log: Created tag stable-2_18_3 for pkg-bindings Added: tags/stable-2_18_3/pkg-bindings/ - copied from r56469, trunk/pkg-bindings/ -- 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] r56469 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Source_Create.cc
by lslezak＠svn.opensuse.org 30 Mar '09

30 Mar '09

Author: lslezak Date: Mon Mar 30 16:53:43 2009 New Revision: 56469 URL: http://svn.opensuse.org/viewcvs/yast?rev=56469&view=rev Log: - use zypp::RepoManager::makeStupidAlias() for generating repository alias - 2.18.3 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Source_Create.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=56469&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Mon Mar 30 16:53:43 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Mon Mar 30 16:53:43 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Mar 30 16:24:58 CEST 2009 - lslezak(a)suse.cz + +- return "is_update_repo" flag in Pkg::SourceGeneralData() call + (requires loaded pool) (bnc#459527) +- use zypp::RepoManager::makeStupidAlias() for generating + repository alias +- 2.18.3 + +------------------------------------------------------------------- Wed Mar 25 16:55:36 CET 2009 - lslezak(a)suse.cz - Fixed Pkg::SourceURL() - remove "credentials" query from URL Modified: trunk/pkg-bindings/src/Source_Create.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Create.c… ============================================================================== --- trunk/pkg-bindings/src/Source_Create.cc (original) +++ trunk/pkg-bindings/src/Source_Create.cc Mon Mar 30 16:53:43 2009 @@ -237,40 +237,9 @@ // alias not set via URL, use the passed alias or the URL path if (alias_r.empty()) { - // use the last path element in URL - std::string url_path = url.getPathName(); + alias = zypp::RepoManager::makeStupidAlias(url); - std::string::size_type pos_begin = url_path.rfind("/"); - std::string::size_type pos_end = std::string::npos; - - // ignore the trailing slash - if (pos_begin == url_path.size() - 1) - { - pos_begin = url_path.rfind("/", url_path.size() - 2); - - if (pos_begin != std::string::npos) - { - pos_end = url_path.size() - pos_begin - 2; - } - } - else - { - pos_end = url_path.size() - pos_begin - 1; - } - - // ignore the found slash character - pos_begin++; - - alias = std::string(url_path, pos_begin, pos_end); - - y2milestone("Alias from URL path: %s", alias.c_str()); - - // fallback - if (alias.empty()) - { - y2milestone("URL alias is empty using 'Repository'"); - alias = "Repository"; - } + y2milestone("Using alias: %s", alias.c_str()); } else { @@ -390,33 +359,8 @@ repo.setAutorefresh(params->value(YCPString("autorefresh"))->asBoolean()->value()); } - std::string alias; - - if (!params->value( YCPString("alias") ).isNull() && params->value(YCPString("alias"))->isString()) - { - alias = params->value(YCPString("alias"))->asString()->value(); - } - - if (alias.empty()) - { - alias = timestamp(); - - // the alias must be unique - alias = UniqueAlias(alias); - } - else - { - if (aliasExists(alias)) - { - y2error("alias %s already exists", alias.c_str()); - return YCPVoid(); - } - } - - repo.setAlias(alias); - // use the first base URL as a fallback name - std::string first_url; + zypp::Url first_url; if (!params->value( YCPString("base_urls") ).isNull() && params->value(YCPString("base_urls"))->isList()) { @@ -457,7 +401,7 @@ if (index == 0) { - first_url = url.asString(); + first_url = url; } repo.addBaseUrl(url); @@ -469,6 +413,33 @@ return YCPVoid(); } + std::string alias; + + if (!params->value( YCPString("alias") ).isNull() && params->value(YCPString("alias"))->isString()) + { + alias = params->value(YCPString("alias"))->asString()->value(); + } + + if (alias.empty()) + { + // generate an alias + alias = zypp::RepoManager::makeStupidAlias(first_url); + + // the alias must be unique + alias = UniqueAlias(alias); + } + else + { + if (aliasExists(alias)) + { + y2error("alias %s already exists", alias.c_str()); + return YCPVoid(); + } + } + + repo.setAlias(alias); + + // check name parameter if (!params->value( YCPString("name") ).isNull() && params->value(YCPString("name"))->isString()) { @@ -480,7 +451,7 @@ // then use the first URL as the name if (repo.name().empty()) { - repo.setName(first_url); + repo.setName(first_url.asString()); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0