May 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r38228 - /tags/stable-2_15_38/network/
by mzugec＠svn.opensuse.org 31 May '07

31 May '07

Author: mzugec Date: Thu May 31 17:46:56 2007 New Revision: 38228 URL: http://svn.opensuse.org/viewcvs/yast?rev=38228&view=rev Log: Created tag stable-2_15_38 for network Added: tags/stable-2_15_38/network/ - copied from r38227, trunk/network/ -- 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] r38227 - in /trunk/network: VERSION package/yast2-network.changes src/dsl/dialogs.ycp src/installation/dialogs.ycp src/modules/Lan.ycp src/routines/widgets.ycp
by mzugec＠svn.opensuse.org 31 May '07

31 May '07

Author: mzugec Date: Thu May 31 17:46:34 2007 New Revision: 38227 URL: http://svn.opensuse.org/viewcvs/yast?rev=38227&view=rev Log: merge code for select interfaces in InternetTest and Dsl (#117426) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/dsl/dialogs.ycp trunk/network/src/installation/dialogs.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/routines/widgets.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38227&r1=382… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu May 31 17:46:34 2007 @@ -1 +1 @@ -2.15.37 +2.15.38 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu May 31 17:46:34 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 31 17:44:21 CEST 2007 - mzugec(a)suse.cz + +- merge code for select interfaces in InternetTest and Dsl (#117426) +- 2.15.38 + +------------------------------------------------------------------- Wed May 30 11:34:16 CEST 2007 - mzugec(a)suse.cz - fixed spec requirements Modified: trunk/network/src/dsl/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/dsl/dialogs.ycp?rev=… ============================================================================== --- trunk/network/src/dsl/dialogs.ycp (original) +++ trunk/network/src/dsl/dialogs.ycp Thu May 31 17:46:34 2007 @@ -106,33 +106,21 @@ /** */ - define void UpdateInterfaces() { - ifaces = NetworkDevices::List("eth"); - y2debug("ifaces=%1", ifaces); - ifaces = union(ifaces, NetworkDevices::List("eth-pcmcia")); - y2debug("ifaces=%1", ifaces); - ifaces = union(ifaces, NetworkDevices::List("eth-usb")); - ifaces = union(ifaces, NetworkDevices::List("wlan")); // #186102 - y2debug("ifaces=%1", ifaces); - + // define void UpdateInterfaces() { +list<string> items = getNetDeviceItems(); +if(size(items)>0 && interface=="") interface=items[0]:""; +y2internal("items %1", items); /* FIXME Why is not the current interface added? */ - if(false && /*interface != "" && */!contains(ifaces, interface)) - ifaces = add(ifaces, interface); +if(false && /*interface != "" && */!contains(ifaces, interface)) ifaces = add(ifaces, interface); - y2debug("ifaces=%1", ifaces); - y2internal("ifaces=%1", ifaces); - ifaces = maplist(string e, (list<string>) ifaces, { - return `item(`id(sformat("%1", e)), sformat("%1", e), e == interface); - }); - y2debug("ifaces=%1", ifaces); - } +//} - /* FIXME: #27137 */ - UpdateInterfaces(); - if(size(ifaces) < 1) { + /* FIXME: #suse27137 */ +// UpdateInterfaces(); + if(size(items) < 1) { NetworkDevices::Push(); if(Lan::Propose()) { - UpdateInterfaces(); +// UpdateInterfaces(); // list<term (term (string), string, boolean)> string i = ifaces[0, 0, 0]:""; y2milestone("i=%1", i); @@ -148,11 +136,18 @@ ["USERCONTROL", "STARTMODE",], widget_descr); + +// list<string> items = NetworkDevices::List(""); +// y2internal("network devices list %1", items); + +/* NetworkDevices::Read(); - map <string, string> device_descr = GetDeviceDescription(Internet::device); + map <string, string> device_descr = GetDeviceDescription(items[0]:""); y2internal("device_descr %1", device_descr); string connection_text = _("%1 - %2 (%3)"); +*/ +y2internal("interface %1", interface); /* DSL dialog contents */ term contents = `HBox( `HSpacing(6), @@ -167,23 +162,14 @@ /* TextEntry label */ `TextEntry(`id(`vpivci), _("&VPI/VCI"), vpivci), `VSpacing(0.2), + `Frame(_("&Ethernet Card"), `HBox( - /* ComboBox label */ -// `Left(`ReplacePoint(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces))), /* RadioButton label */ - `Left(`ReplacePoint(`id(`rp), `Label(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned"))))), +// `Left(`ReplacePoint(`id(`rp), `Label(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned"))))), // push button label - `Right(`PushButton(`id(`net_expert), _("&Change Device"))) - /* TextEntry label */ - // `TextEntry(`id(`interface), _("&Ethernet Card"), interface), -// `HSpacing(1), -/* - `VBox( - `Label(""), - `PushButton(`id(`lan), _("&Configure Network Cards")) - ) -*/ - ), +getDeviceContens(interface) + )), + `PushButton(`id(`lan), _("&Configure Network Cards")), `VSpacing(0.2), /* TextEntry label */ `TextEntry(`id(`modemip), _("Modem &IP Address"), modemip) @@ -207,7 +193,7 @@ UI::ChangeWidget (`id ("STARTMODE"), `Value, startmode); UI::ChangeWidget(`id(`vpivci), `Enabled, pppmode == "pppoatm"); - UI::ChangeWidget(`id(`interface), `Enabled, pppmode == "pppoe"); + enableDevices(pppmode == "pppoe" || pppmode == "pptp"); UI::ChangeWidget(`id(`lan), `Enabled, pppmode == "pppoe" || pppmode == "pptp"); UI::ChangeWidget(`id(`modemip), `Enabled, pppmode == "pptp"); @@ -225,7 +211,7 @@ else if(ret == `next) { /* check_* */ pppmode = (string) UI::QueryWidget(`id(`pppmode), `Value); - interface = (string) UI::QueryWidget(`id(`interface), `Value); +// interface = (string) UI::QueryWidget(`id(`interface), `Value); vpivci = (string) UI::QueryWidget(`id(`vpivci), `Value); modemip = (string) UI::QueryWidget(`id(`modemip), `Value); if(pppmode == "pppoatm" && vpivci == "") { @@ -251,7 +237,8 @@ else if(ret == `pppmode) { pppmode = (string) UI::QueryWidget(`id(`pppmode), `Value); UI::ChangeWidget(`id(`vpivci), `Enabled, pppmode == "pppoatm"); - UI::ChangeWidget(`id(`interface), `Enabled, pppmode == "pppoe" || pppmode == "pptp"); + enableDevices(pppmode == "pppoe"|| pppmode == "pptp"); +// UI::ChangeWidget(`id(`interface), `Enabled, pppmode == "pppoe" || pppmode == "pptp"); UI::ChangeWidget(`id(`lan), `Enabled, pppmode == "pppoe" || pppmode == "pptp"); UI::ChangeWidget(`id(`modemip), `Enabled, pppmode == "pptp"); continue; @@ -261,11 +248,14 @@ NetworkDevices::Push(); Call::Function("lan_proposal", ["AskUser"]); NetworkDevices::Pop(); - interface = (string) UI::QueryWidget(`id(`interface), `Value); - UpdateInterfaces(); - UI::ReplaceWidget(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces)); + items = getNetDeviceItems(); + refreshDevice(interface); +// interface = (string) UI::QueryWidget(`id(`interface), `Value); +// UpdateInterfaces(); +// UI::ReplaceWidget(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces)); continue; } + else if (ret == `net_expert) interface = handleDevice (items, interface); else { y2error("Unexpected return code: %1", ret); continue; @@ -277,7 +267,7 @@ DSL::pppmode = pppmode; if(pppmode == "pppoe" || pppmode == "pptp") { - DSL::interface = (string) UI::QueryWidget(`id(`interface), `Value); + DSL::interface = interface;//(string) UI::QueryWidget(`id(`interface), `Value); // If firewall is active and interface in no zone, nothing // gets through (#47309) so add it to the external zone if (SuSEFirewall4Network::IsOn ()) Modified: trunk/network/src/installation/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/dialogs… ============================================================================== --- trunk/network/src/installation/dialogs.ycp (original) +++ trunk/network/src/installation/dialogs.ycp Thu May 31 17:46:34 2007 @@ -21,6 +21,7 @@ import "String"; import "Wizard"; include "network/routines.ycp"; +include "network/widgets.ycp"; /** * Ask for password if required @@ -57,37 +58,6 @@ return ret == `ok; } -define map <string, string> GetDeviceDescription(string device_id) { - - string device_name = NetworkDevices::GetValue(device_id,"NAME"); - - if ( (device_name == nil) || (device_name == "") ) { - //TRANSLATORS: Informs that device name is not known - device_name = _("Unknown device"); - } - //avoid too long device names - if (size(device_name) > 30) { - device_name = substring (device_name, 0, 27) + "..."; - } - - string ip_addr = (NetworkDevices::GetValue(device_id, "BOOTPROTO") == "dhcp" ? - // TRANSLATORS: Informs that the IP address is assigned via DHCP - _("DHCP address") : - NetworkDevices::GetValue(device_id, "IPADDR")); - if ( (ip_addr == nil) || (ip_addr == "")) { - //TRANSLATORS: Informs that no IP has been assigned to the device - ip_addr = _("No IP address assigned"); - } - - map <string, string> ret = $[ - - "type" : NetworkDevices::GetDeviceType(device_id), - "name" : device_name, - "ipaddr" : ip_addr, - ]; - - return ret; -} /** * Connection steps dialog @@ -126,24 +96,21 @@ activate the test procedure."), ]; - if(haskey(labels, Internet::type)) - label = labels[Internet::type]:""; + if(haskey(labels, Internet::type)) label = labels[Internet::type]:""; + +list<string> items = getEthernetItems(); boolean already_up = false; if(!Mode::test ()) already_up = Internet::Status(); - /* Label text - selected network device to network test */ - string connection_text = _("&Yes, Test Connection to the Internet\nvia %1 - %2 (%3)"); - map <string, string> device_descr = GetDeviceDescription(Internet::device); - +string current = Internet::device; /* Radiobuttons */ term buttons = `VBox( `VSpacing(1), /* RadioButton label */ - `Left(`ReplacePoint(`id(`rp), `RadioButton(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned")), Internet::do_test))), - // push button label - `Right(`PushButton(`id(`net_expert), _("&Change Device"))), + `Left(`RadioButton(`id(`yes), `opt(`notify), _("&Yes, Test Connection to the Internet via"), Internet::do_test)), + getDeviceContens(current), /* RadioButton label */ - `Left(`RadioButton(`id(`no), _("N&o, Skip This Test"), !Internet::do_test)), + `Left(`RadioButton(`id(`no), `opt(`notify), _("N&o, Skip This Test"), !Internet::do_test)), `VSpacing(1) ); @@ -190,55 +157,41 @@ Wizard::SetContents(caption, contents, help, true, true); Wizard::SetTitleIcon ("yast-network"); +initDevice(items); - list<string> items = NetworkDevices::List(""); - items = filter (string i, items, ``( i != "lo" )); - y2milestone("network devices list %1", items); - if (items == [] || items == ["lo"]) // #146167 - { - // no interesting ifcfgs, ask ip - items = Internet::GetDevices (); - } - //If only one device is present, disable "Change device" button - if (size(items) <= 1){ - UI::ChangeWidget(`id(`net_expert),`Enabled,false); - } - - any ret = nil; - - while(true) + symbol ret = nil; + boolean exit=false; + do { - ret = UI::UserInput(); - - if (ret == `net_expert) + ret = (symbol)UI::UserInput(); + switch( ret ) { - import "NetworkPopup"; - // popup dialog title - string via_device = NetworkPopup::ChooseItem(_("Network Device Select"), items, Internet::device); - if (via_device != nil) - { - map <string, string> device_descr = GetDeviceDescription(via_device); - Internet::SetDevice( via_device ); - UI::ReplaceWidget(`id(`rp), `RadioButton(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:""), Internet::do_test)); - y2milestone("selected network device :%1", via_device); - } - } - else if (ret == `abort || ret == `cancel) - { - if (Popup::ConfirmAbort (`incomplete)) + case `net_expert : + current = handleDevice(items, current); break; - } - else if (ret == `next || ret == `back) - { + case `abort: + case `cancel: + if (Popup::ConfirmAbort (`incomplete)){ + exit=true; + break; + } + case `next: + case `back: + exit=true; break; + case `yes: + enableDevices(true); + break; + case `no: + enableDevices(false); + break; + default: + y2error("Unexpected return code:%1", ret); + } - else - { - y2error("Unexpected return code: %1", ret); - } - } + }while(!exit); Internet::do_test = UI::QueryWidget(`id(`rb), `CurrentButton) == `yes; y2debug("Internet::do_test=%1", Internet::do_test); Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Thu May 31 17:46:34 2007 @@ -1712,10 +1712,11 @@ /* Some HW found -> use it for proposal */ if(size(Hardware) > 0) { - if (Arch::s390()){ +// if (Arch::s390()){ // tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); - } - else tosel = FindMatchingDevice($[]); +// } +// else + tosel = FindMatchingDevice($[]); } Modified: trunk/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/widgets.ycp… ============================================================================== --- trunk/network/src/routines/widgets.ycp (original) +++ trunk/network/src/routines/widgets.ycp Thu May 31 17:46:34 2007 @@ -16,6 +16,8 @@ // This is just a start. import "IP"; +import "NetworkPopup"; +import "NetworkDevices"; /** * Validator for IP adresses, no_popup @@ -78,26 +80,6 @@ "opt": [], "help": _("H"), ], -/* - "": $[ - "widget": `, - "label": _(""), - "opt": [], - "help": _("H"), - ], - "": $[ - "widget": `, - "label": _(""), - "opt": [], - "help": _("H"), - ], - "": $[ - "widget": `, - "label": _(""), - "opt": [], - "help": _("H"), - ], -*/ ]; /** @@ -200,5 +182,87 @@ return ret; } + +define string GetDeviceDescription(string device_id) { + string device_name = NetworkDevices::GetValue(device_id,"NAME"); + if ( (device_name == nil) || (device_name == "") ) { + //TRANSLATORS: Informs that device name is not known + device_name = _("Unknown device"); + } + //avoid too long device names + if (size(device_name) > 30) { + device_name = substring (device_name, 0, 27) + "..."; + } + string ip_addr = (NetworkDevices::GetValue(device_id, "BOOTPROTO") == "dhcp" ? + // TRANSLATORS: Informs that the IP address is assigned via DHCP + _("DHCP address") : + NetworkDevices::GetValue(device_id, "IPADDR")); + if ( (ip_addr == nil) || (ip_addr == "")) { + //TRANSLATORS: Informs that no IP has been assigned to the device + ip_addr = _("No IP address assigned"); + } + string output = sformat(_("%1 - %2 (%3)"), + device_name, NetworkDevices::GetDeviceType(device_id), ip_addr); + return output; +} + + + +list<string> getEthernetItems(){ + NetworkDevices::Read(); + list<string> items = NetworkDevices::List("eth"); + items = filter (string i, items, ``( i != "lo" )); + y2internal("network devices list %1", items); + return items; +} + +list<string> getNetDeviceItems(){ + NetworkDevices::Read(); + list<string> ifaces = NetworkDevices::List("eth"); + y2debug("ifaces=%1", ifaces); + ifaces = (list<string>)union((list)ifaces, (NetworkDevices::List("eth-pcmcia"))); + y2debug("ifaces=%1", ifaces); + ifaces = (list<string>)union((list)ifaces, NetworkDevices::List("eth-usb")); + ifaces = (list<string>)union((list)ifaces, NetworkDevices::List("wlan")); // #186102 + y2debug("ifaces=%1", ifaces); + return ifaces; +} + +term getDeviceContens(string selected){ +return `VBox( + `VSpacing(1), + `Left(`Label(`id(`net_device), GetDeviceDescription(selected))), + `Right(`PushButton(`id(`net_expert), _("&Change Device"))), + `VSpacing(1) + ); +} + + +void initDevice(list<string> items){ + //If only one device is present, disable "Change device" button + if (size(items) <= 1) UI::ChangeWidget(`id(`net_expert),`Enabled,false); +} + +void enableDevices(boolean enable){ + UI::ChangeWidget(`net_device, `Enabled, enable); + UI::ChangeWidget(`net_expert, `Enabled, enable); +} + +void refreshDevice(string via_device){ + UI::ChangeWidget(`net_device, `Value, GetDeviceDescription(via_device)); +} + +string handleDevice(list<string>items, string selected){ + // popup dialog title + string via_device = NetworkPopup::ChooseItem(_("Network Device Select"), items, selected); + if (via_device != nil) + { + UI::ChangeWidget(`net_device, `Value, GetDeviceDescription(via_device)); + y2milestone("selected network device :%1", via_device); + selected = via_device; + } + return selected; +} + /* EOF */ } -- 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] r38226 - /tags/stable-2_15_14/storage/
by fehr＠svn.opensuse.org 31 May '07

31 May '07

Author: fehr Date: Thu May 31 16:42:13 2007 New Revision: 38226 URL: http://svn.opensuse.org/viewcvs/yast?rev=38226&view=rev Log: Created tag stable-2_15_14 for storage Added: tags/stable-2_15_14/storage/ - copied from r38225, trunk/storage/ -- 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] r38225 - in /trunk/storage: VERSION controller/src/controller.ycp package/yast2-storage.changes
by fehr＠svn.opensuse.org 31 May '07

31 May '07

Author: fehr Date: Thu May 31 16:02:59 2007 New Revision: 38225 URL: http://svn.opensuse.org/viewcvs/yast?rev=38225&view=rev Log: - make help option in controller module work (#269888) - version 2.15.14 Modified: trunk/storage/VERSION trunk/storage/controller/src/controller.ycp trunk/storage/package/yast2-storage.changes Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=38225&r1=382… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Thu May 31 16:02:59 2007 @@ -1 +1 @@ -2.15.13 +2.15.14 Modified: trunk/storage/controller/src/controller.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/controller/src/controlle… ============================================================================== --- trunk/storage/controller/src/controller.ycp (original) +++ trunk/storage/controller/src/controller.ycp Thu May 31 16:02:59 2007 @@ -18,6 +18,7 @@ { textdomain "storage"; +import "CommandLine"; import "Wizard"; import "Misc"; /*import "Bootloader";*/ @@ -245,6 +246,8 @@ } } +define any Sequence () + { Wizard::OpenAbortApplyFinishDialog(); list<map> dev = []; @@ -637,5 +640,19 @@ } while( ret != `abort && ret!=`cancel && ret != `finish ); UI::CloseDialog(); + } + +/* -- the command line description map -------------------------------------- */ +map cmdline = $[ + "id" : "controller", + // translators: command line help text for controller module + "help" : _("Enabling and Disabling of Disk Controller Modules"), + // custum help text (should replace default one) + "customhelp" : _("Command line interface for the disk controller module is not available"), + "guihandler" : Sequence + ]; + +CommandLine::Run (cmdline); +return true; } Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu May 31 16:02:59 2007 @@ -2,6 +2,8 @@ Thu May 31 15:53:00 CEST 2007 - fehr(a)suse.de - automatically increase GPT before creating partitions (#236404) +- make help option in controller module work (#269888) +- version 2.15.14 ------------------------------------------------------------------- Tue May 29 16:20:34 CEST 2007 - aschnell(a)suse.de -- 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] r38224 - in /trunk/storage: libstorage/src/Disk.cc libstorage/src/Disk.h package/yast2-storage.changes
by fehr＠svn.opensuse.org 31 May '07

31 May '07

Author: fehr Date: Thu May 31 15:54:15 2007 New Revision: 38224 URL: http://svn.opensuse.org/viewcvs/yast?rev=38224&view=rev Log: automatically increase GPT before creating partitions (#236404) Modified: trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Disk.h trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu May 31 15:54:15 2007 @@ -21,7 +21,8 @@ #include "y2storage/AppUtil.h" #include "y2storage/SystemCmd.h" -#define PARTEDCMD "/usr/sbin/parted -s " // blank at end !! +#define PARTEDBIN "/usr/sbin/parted" +#define PARTEDCMD PARTEDBIN " -s " // blank at end !! using namespace std; using namespace storage; @@ -30,7 +31,7 @@ unsigned long long SizeK ) : Container(s,"",staticType()) { - init_disk = dmp_slave = iscsi = false; + init_disk = dmp_slave = iscsi = gpt_enlarge = false; nm = Name; undevDevice(nm); logfile_name = nm; @@ -52,7 +53,7 @@ y2milestone( "constructed disk %s nr %u sizeK:%llu", Name.c_str(), num, SizeK ); logfile_name = Name + decString(num); - init_disk = dmp_slave = iscsi = false; + init_disk = dmp_slave = iscsi = gpt_enlarge = false; ronly = true; size_k = SizeK; head = new_head = 16; @@ -71,7 +72,7 @@ Disk::Disk( Storage * const s, const string& fname ) : Container(s,"",staticType()) { - init_disk = dmp_slave = iscsi = false; + init_disk = dmp_slave = iscsi = gpt_enlarge = false; nm = fname.substr( fname.find_last_of( '/' )+1); if( nm.find("disk_")==0 ) nm.erase( 0, 5 ); @@ -417,7 +418,8 @@ byte_cyl = head * sector * 512; y2milestone( "byte_cyl:%lu", byte_cyl ); } - y2milestone( "Label:%s", dlabel.c_str() ); + gpt_enlarge = Cmd.select( "fix the GPT to use all" )>0; + y2milestone( "Label:%s gpt_enlarge:%d", dlabel.c_str(), gpt_enlarge ); if( dlabel!="loop" ) { setLabelData( dlabel ); @@ -1857,6 +1859,7 @@ getStorage()->waitForDevice(); redetectGeometry(); } + gpt_enlarge = false; y2milestone( "ret:%d", ret ); return( ret ); } @@ -2082,9 +2085,24 @@ return( ret ); } +void Disk::enlargeGpt() + { + y2mil( "gpt_enlarge:" << gpt_enlarge ); + if( gpt_enlarge ) + { + string cmd_line( "yes Fix | " PARTEDBIN ); + cmd_line += " ---pretend-input-tty "; + cmd_line += device(); + cmd_line += " print "; + SystemCmd cmd( cmd_line ); + gpt_enlarge = false; + } + } + static bool logicalCreated( const Partition& p ) { return( p.type()==LOGICAL && p.created() ); } + int Disk::doCreate( Volume* v ) { Partition * p = dynamic_cast<Partition *>(v); @@ -2109,6 +2127,10 @@ if( ret==0 ) detected_label = label; } + if( ret==0 && gpt_enlarge ) + { + enlargeGpt(); + } std::ostringstream cmd_line; if( ret==0 ) { @@ -2576,6 +2598,8 @@ s << " iSCSI"; if( d.dmp_slave ) s << " DmpSlave"; + if( d.gpt_enlarge ) + s << " GptEnlarge"; return( s ); } @@ -2670,7 +2694,7 @@ ext_possible==rhs.ext_possible && max_logical==rhs.max_logical && init_disk==rhs.init_disk && label==rhs.label && iscsi==rhs.iscsi && sysfs_dir==rhs.sysfs_dir && - dmp_slave==rhs.dmp_slave; + dmp_slave==rhs.dmp_slave && gpt_enlarge==rhs.gpt_enlarge; if( ret ) { ConstPartPair p = partPair(); @@ -2712,6 +2736,7 @@ logfile_name = rhs.logfile_name; sysfs_dir = rhs.sysfs_dir; dmp_slave = rhs.dmp_slave; + gpt_enlarge = rhs.gpt_enlarge; return( *this ); } Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?re… ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Thu May 31 15:54:15 2007 @@ -187,6 +187,7 @@ unsigned long len, bool checkRelaxed ); void removePresentPartitions(); void removeFromMemory(); + void enlargeGpt(); static bool notDeleted( const Partition&d ) { return( !d.deleted() ); } static bool bootSpecial( const Partition&d ) { return( !d.deleted()&&(d.id()==0x41||d.id()==0x06) ); } @@ -225,6 +226,7 @@ bool init_disk; bool iscsi; bool dmp_slave; + bool gpt_enlarge; unsigned max_logical; unsigned long byte_cyl; unsigned long range; Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu May 31 15:54:15 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu May 31 15:53:00 CEST 2007 - fehr(a)suse.de + +- automatically increase GPT before creating partitions (#236404) + +------------------------------------------------------------------- Tue May 29 16:20:34 CEST 2007 - aschnell(a)suse.de - fixed crash during detection (caused by empty key-value-pair) -- 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] r38223 - /branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc
by sh-sh-sh＠svn.opensuse.org 31 May '07

31 May '07

Author: sh-sh-sh Date: Thu May 31 15:27:31 2007 New Revision: 38223 URL: http://svn.opensuse.org/viewcvs/yast?rev=38223&view=rev Log: don't change throw location Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Thu May 31 15:27:31 2007 @@ -182,7 +182,7 @@ catch( YUIPropertyException & exception ) { exception.setWidget( this ); - YUI_RETHROW( exception ); + throw; } if ( propertyName == YUIProperty_Enabled ) setEnabling( val.boolVal() ); @@ -200,7 +200,7 @@ catch( YUIPropertyException & exception ) { exception.setWidget( this ); - YUI_RETHROW( exception ); + throw; } if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( getEnabling() ); -- 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] r38222 - in /branches/tmp/sh/mod-ui/core/libyui/src: YProperty.cc YProperty.h YRadioButton.cc YUIException.cc YUIException.h YWidget.cc
by sh-sh-sh＠svn.opensuse.org 31 May '07

31 May '07

Author: sh-sh-sh Date: Thu May 31 15:13:34 2007 New Revision: 38222 URL: http://svn.opensuse.org/viewcvs/yast?rev=38222&view=rev Log: property exception handling Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc Thu May 31 15:13:34 2007 @@ -18,7 +18,7 @@ /-*/ #include "YProperty.h" - +#include "YUIException.h" #if 0 @@ -52,23 +52,42 @@ } -YPropertySet::SearchResult -YPropertySet::lookup( const std::string & propertyName ) const +void +YPropertySet::check( const std::string & propertyName ) const +{ + if ( ! contains( propertyName ) ) + YUI_THROW( YUIUnknownPropertyException( propertyName ) ); +} + + +void +YPropertySet::check( const std::string & propertyName, YPropertyType type ) const +{ + if ( ! contains( propertyName ) ) + YUI_THROW( YUIUnknownPropertyException( propertyName ) ); + + // YPropertySet::contains( const std::string &, YPropertyType ) will throw + // a YUIPropertyTypeMismatchException, if applicable +} + + +bool +YPropertySet::contains( const std::string & propertyName ) const throw() { for ( std::vector<YProperty>::const_iterator it = _properties.begin(); it != _properties.end(); ++it ) { if ( it->name() == propertyName ) - return Found; + return true; } - return NotFound; + return false; } -YPropertySet::SearchResult -YPropertySet::lookup( const std::string & propertyName, YPropertyType type ) const +bool +YPropertySet::contains( const std::string & propertyName, YPropertyType type ) const { for ( std::vector<YProperty>::const_iterator it = _properties.begin(); it != _properties.end(); @@ -76,14 +95,17 @@ { if ( it->name() == propertyName ) { + if ( it->isReadOnly() ) + YUI_THROW( YUISetReadOnlyPropertyException( *it ) ); + if ( it->type() == type ) - return Found; + return true; else - return TypeMismatch; + YUI_THROW( YUIPropertyTypeMismatchException( *it, type ) ); } } - return NotFound; + return false; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h Thu May 31 15:13:34 2007 @@ -47,11 +47,13 @@ { public: /** - * Constructor: Create a property with the specified name. + * Constructor: Create a property with the specified name and type. + * 'isReadOnly' is for properties that cannot be set, only retrieved. **/ - YProperty( const std::string & name, YPropertyType type ) + YProperty( const std::string & name, YPropertyType type, bool isReadOnly = false ) : _name( name ) , _type( type ) + , _isReadOnly( isReadOnly ) {} /** @@ -65,6 +67,11 @@ YPropertyType type() const { return _type; } /** + * Returns 'true' if this property cannot be changed, only retrieved. + **/ + bool isReadOnly() const { return _isReadOnly; } + + /** * Returns the type of this property as string. **/ std::string typeAsStr() const { return YProperty::typeAsStr( _type ); } @@ -73,11 +80,12 @@ * Returns a string description of a property type. **/ static std::string typeAsStr( YPropertyType type ); - + private: std::string _name; YPropertyType _type; + bool _isReadOnly; }; @@ -149,30 +157,60 @@ **/ YPropertySet(); - enum SearchResult - { - NotFound = 0, // = 0 for use like: if ( ! propSet.lookup( "Label" ) ) ... - Found, - TypeMismatch // Found, but wrong type - }; + /** + * Check if a property 'propertyName' exists in this property set. + * Throw a YUIUnknownPropertyException if it does not exist. + * Use YPropertySet::contains() for a check that simply returns 'false' + * if it does not exist. + **/ + void check( const std::string & propertyName ) const; + + /** + * Check if a property 'propertyName' exists in this property set. + * Throw a YUIUnknownPropertyException if it does not exist. + * + * If there is a property with that name, check also the expected type + * against 'type'. If the types don't match, throw a + * YUIPropertyTypeMismatchException. + * If the property is read-only, throw a YUISetReadOnlyPropertyException. + **/ + void check( const std::string & propertyName, YPropertyType type ) const; + + /** + * Same as above, overloaded for convenience. + **/ + void check( const YProperty & prop ) const + { check( prop.name(), prop.type() ); } /** - * Look up a property with 'propertyName' in this property set. + * Check if a property 'propertyName' exists in this property set. + * Returns 'true' if it exists, 'false' if not. + * + * Use YPropertySet::check() for a check that throws exceptions if + * there is no such property. **/ - SearchResult lookup( const std::string & propertyName ) const; + bool contains( const std::string & propertyName ) const throw(); /** - * Look up a property with 'propertyName' in this property set. - * If it contains a property with that name, check also the expected - * type against 'type'. + * Check if a property 'propertyName' exists in this property set. + * Returns 'true' if it exists, 'false' if not. + * + * If there is a property with that name, check also the expected type + * against 'type'. If the types don't match, throw a + * YUIPropertyTypeMismatchException. + * + * If the property is read-only, throw a YUISetReadOnlyPropertyException. + * + * Use YPropertySet::check() for a check that throws exceptions if + * there is no such property. **/ - SearchResult lookup( const std::string & propertyName, YPropertyType type ) const; + bool contains( const std::string & propertyName, YPropertyType type ) const; /** * Same as above, overloaded for convenience. **/ - SearchResult lookup( const YProperty & prop ) const - { return lookup( prop.name(), prop.type() ); } + bool contains( const YProperty & prop ) const + { return contains( prop.name(), prop.type() ); } /** * Returns 'true' if this property set does not contain anything. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc Thu May 31 15:13:34 2007 @@ -95,14 +95,13 @@ void YRadioButton::setProperty( const std::string & propertyName, const YPropertyValue & val ) { - YPropertySet::SearchResult result = propertySet().lookup( propertyName, val.type() ); + propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch - if ( result == YPropertySet::Found ) + if ( propertyName == YUIProperty_Value ) setValue( val.boolVal() ); + else if ( propertyName == YUIProperty_Label ) setLabel( val.stringVal() ); + else { - if ( propertyName == YUIProperty_Value ) setValue( val.boolVal() ); - else if ( propertyName == YUIProperty_Label ) setLabel( val.stringVal() ); - else - YWidget::setProperty( propertyName, val ); + YWidget::setProperty( propertyName, val ); } } @@ -110,14 +109,13 @@ YPropertyValue YRadioButton::getProperty( const std::string & propertyName ) { - YPropertySet::SearchResult result = propertySet().lookup( propertyName ); + propertySet().check( propertyName ); // throws exceptions if not found - if ( result == YPropertySet::Found ) + if ( propertyName == YUIProperty_Value ) return YPropertyValue( value() ); + if ( propertyName == YUIProperty_Label ) return YPropertyValue( label() ); + else { - if ( propertyName == YUIProperty_Value ) return YPropertyValue( value() ); - if ( propertyName == YUIProperty_Label ) return YPropertyValue( label() ); - else - return YWidget::getProperty( propertyName ); + return YWidget::getProperty( propertyName ); } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc Thu May 31 15:13:34 2007 @@ -156,16 +156,33 @@ ostream & YUIPropertyTypeMismatchException::dumpOn( ostream & str ) const { - const char * widgetClass = widget() ? - widget()->widgetClass() : - "<Unknown Widget Type>"; + std::string widgetClass; + + if ( widget() ) + widgetClass = std::string( widget()->widgetClass() ) + "::"; return str << "Property type mismatch: " << widgetClass - << "::" << property().name() + << property().name() << "is type " << property().typeAsStr() << ", not " - << value().typeAsStr() + << YProperty::typeAsStr( type() ) + << endl; +} + + +ostream & +YUISetReadOnlyPropertyException::dumpOn( ostream & str ) const +{ + std::string widgetClass; + + if ( widget() ) + widgetClass = std::string( widget()->widgetClass() ) + "::"; + + return str << "Property " + << widgetClass + << property().name() + << "is read-only!" << endl; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h Thu May 31 15:13:34 2007 @@ -362,10 +362,15 @@ YProperty property() const { return _property; } /** - * Returns the associated widget or 0 if there was none. + * Returns the corresponding widget or 0 if there was none. **/ YWidget * widget() const { return _widget; } + /** + * Set the corresponding widget. + **/ + void setWidget( YWidget * w ) { _widget = w; } + protected: /** @@ -387,7 +392,8 @@ class YUIUnknownPropertyException: public YUIPropertyException { public: - YUIUnknownPropertyException( const std::string & propertyName, YWidget * widget ) + YUIUnknownPropertyException( const std::string & propertyName, + YWidget * widget = 0 ) : YUIPropertyException( YProperty( propertyName, YUnknownPropertyType ), widget ) {} @@ -412,20 +418,20 @@ { public: - YUIPropertyTypeMismatchException( const YProperty & property, - const YPropertyValue & value, - YWidget * widget ) + YUIPropertyTypeMismatchException( const YProperty & property, + YPropertyType type, + YWidget * widget = 0 ) : YUIPropertyException( property, widget ) - , _val( value ) + , _type( type ) {} virtual ~YUIPropertyTypeMismatchException() throw() {} /** - * Return the property value (and type) the application tried to set. + * Return the property type the application tried to set. **/ - YPropertyValue value() const { return _val; } + YPropertyType type() const { return _type; } protected: @@ -436,7 +442,32 @@ virtual ostream & dumpOn( ostream & str ) const; private: - YPropertyValue _val; + YPropertyType _type; +}; + + +/** + * Exception class for attempt to set a read-only property. + **/ +class YUISetReadOnlyPropertyException: public YUIPropertyException +{ +public: + + YUISetReadOnlyPropertyException( const YProperty & property, + YWidget * widget = 0 ) + : YUIPropertyException( property, widget ) + {} + + virtual ~YUISetReadOnlyPropertyException() throw() + {} + +protected: + + /** + * Write proper error message with all relevant data. + * Reimplemented from YUIException. + **/ + virtual ostream & dumpOn( ostream & str ) const; }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Thu May 31 15:13:34 2007 @@ -33,6 +33,7 @@ #include "YUIComponent.h" #include "YUI.h" #include "YDialog.h" +#include "YUIException.h" using std::string; @@ -156,15 +157,15 @@ YWidget::propertySet() { static YPropertySet propSet; - + if ( propSet.isEmpty() ) { propSet.add( YProperty( YUIProperty_Enabled, YBoolProperty ) ); propSet.add( YProperty( YUIProperty_Notify, YBoolProperty ) ); propSet.add( YProperty( YUIProperty_WindowID, YIntegerProperty) ); - propSet.add( YProperty( YUIProperty_WidgetClass, YStringProperty ) ); - propSet.add( YProperty( YUIProperty_DebugLabel, YStringProperty ) ); - propSet.add( YProperty( YUIProperty_DialogDebugLabel, YStringProperty ) ); + propSet.add( YProperty( YUIProperty_WidgetClass, YStringProperty, true ) ); // read-only + propSet.add( YProperty( YUIProperty_DebugLabel, YStringProperty, true ) ); // read-only + propSet.add( YProperty( YUIProperty_DialogDebugLabel, YStringProperty, true ) ); // read-only } return propSet; @@ -174,38 +175,41 @@ void YWidget::setProperty( const std::string & propertyName, const YPropertyValue & val ) { - YPropertySet::SearchResult result = propertySet().lookup( propertyName, val.type() ); - - if ( result == YPropertySet::Found ) + try { - if ( propertyName == YUIProperty_Enabled ) setEnabling( val.boolVal() ); - else if ( propertyName == YUIProperty_Notify ) setNotify ( val.boolVal() ); - else - { - if ( propertyName == YUIProperty_WidgetClass || - propertyName == YUIProperty_DebugLabel || - propertyName == YUIProperty_DialogDebugLabel ) - { - y2error( "Property \"%s\" is read-only", propertyName.c_str() ); - } - } + propertySet().check( propertyName, val.type() ); // throws exceptions if not found or type mismatch } + catch( YUIPropertyException & exception ) + { + exception.setWidget( this ); + YUI_RETHROW( exception ); + } + + if ( propertyName == YUIProperty_Enabled ) setEnabling( val.boolVal() ); + else if ( propertyName == YUIProperty_Notify ) setNotify ( val.boolVal() ); } YPropertyValue YWidget::getProperty( const std::string & propertyName ) { - YPropertySet::SearchResult result = propertySet().lookup( propertyName ); - - if ( result == YPropertySet::Found ) + try { - if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( getEnabling() ); - if ( propertyName == YUIProperty_Notify ) return YPropertyValue( getNotify() ); - if ( propertyName == YUIProperty_WidgetClass ) return YPropertyValue( widgetClass() ); - if ( propertyName == YUIProperty_DebugLabel ) return YPropertyValue( debugLabel() ); - if ( propertyName == YUIProperty_DialogDebugLabel ) return YPropertyValue( yDialog()->debugLabel() ); + propertySet().check( propertyName ); // throws exceptions if not found } + catch( YUIPropertyException & exception ) + { + exception.setWidget( this ); + YUI_RETHROW( exception ); + } + + if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( getEnabling() ); + if ( propertyName == YUIProperty_Notify ) return YPropertyValue( getNotify() ); + if ( propertyName == YUIProperty_WidgetClass ) return YPropertyValue( widgetClass() ); + if ( propertyName == YUIProperty_DebugLabel ) return YPropertyValue( debugLabel() ); + if ( propertyName == YUIProperty_DialogDebugLabel ) return YPropertyValue( yDialog()->debugLabel() ); + + return YPropertyValue( false ); // NOTREACHED } @@ -271,16 +275,16 @@ if ( symbol == YUIProperty_WindowID ) return YCPInteger( windowID ); /** * @property string WidgetClass the widget class of this widget (YLabel, YPushButton, ...) - */ + */ if ( symbol == YUIProperty_WidgetClass ) return YCPString( widgetClass() ); /** * @property string DebugLabel a (possibly translated) text describing this widget for debugging - */ + */ if ( symbol == YUIProperty_DebugLabel ) return YCPString( debugLabel() ); /** * @property string DialogDebugLabel a (possibly translated) text describing this dialog for debugging - */ - if ( symbol == YUIProperty_DialogDebugLabel ) + */ + if ( symbol == YUIProperty_DialogDebugLabel ) { return YUIComponent::ui()->currentDialog()->queryWidget( property ); } -- 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] r38221 - in /trunk/ncurses/src: NCPkgTable.cc pkg/NCPackageSelector.cc
by gs＠svn.opensuse.org 31 May '07

31 May '07

Author: gs Date: Thu May 31 14:25:45 2007 New Revision: 38221 URL: http://svn.opensuse.org/viewcvs/yast?rev=38221&view=rev Log: allow status change of patch packages Modified: trunk/ncurses/src/NCPkgTable.cc trunk/ncurses/src/pkg/NCPackageSelector.cc Modified: trunk/ncurses/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPkgTable.cc?rev=38… ============================================================================== --- trunk/ncurses/src/NCPkgTable.cc (original) +++ trunk/ncurses/src/NCPkgTable.cc Thu May 31 14:25:45 2007 @@ -316,6 +316,7 @@ switch ( tableType ) { case T_Packages: + case T_PatchPkgs: case T_Update: // check/show dependencies of packages packager->showPackageDependencies( false ); // only check if automatic check is ON Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Thu May 31 14:25:45 2007 @@ -1484,8 +1484,8 @@ { // set the connection to the NCPackageSelector !!!! patchPkgs->setPackager( this ); - // set status strategy - NCPkgStatusStrategy * strategy = new PatchPkgStatStrategy(); + // set status strategy - don't set extra strategy, use 'normal' package strategy + NCPkgStatusStrategy * strategy = new PackageStatStrategy(); patchPkgs->setTableType( NCPkgTable::T_PatchPkgs, strategy ); patchPkgs->fillHeader( ); -- 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] r38220 - /trunk/ncurses/package/yast2-ncurses.changes
by gs＠svn.opensuse.org 31 May '07

31 May '07

Author: gs Date: Thu May 31 11:03:25 2007 New Revision: 38220 URL: http://svn.opensuse.org/viewcvs/yast?rev=38220&view=rev Log: Load library libpy2ncurses_pkg as plugin Modified: trunk/ncurses/package/yast2-ncurses.changes 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 Thu May 31 11:03:25 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu May 31 11:00:22 CEST 2007 - gs(a)suse.de + +- Load library libpy2ncurses_pkg as plugin + +------------------------------------------------------------------- Tue May 29 13:03:07 CEST 2007 - kmachalkova(a)suse.cz - Removed obsolete save/load selection stuff + related NCPkgPopupFile -- 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] r38219 - /tags/stable-2_15_7/samba-client/
by jsuchome＠svn.opensuse.org 31 May '07

31 May '07

Author: jsuchome Date: Thu May 31 10:33:57 2007 New Revision: 38219 URL: http://svn.opensuse.org/viewcvs/yast?rev=38219&view=rev Log: Created tag stable-2_15_7 for samba-client Added: tags/stable-2_15_7/samba-client/ - copied from r38218, trunk/samba-client/ -- 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] r38218 - in /trunk/samba-client: VERSION package/yast2-samba-client.changes src/SambaNmbLookup.pm src/dialogs.ycp src/helps.ycp src/routines.ycp
by jsuchome＠svn.opensuse.org 31 May '07

31 May '07

Author: jsuchome Date: Thu May 31 10:32:55 2007 New Revision: 38218 URL: http://svn.opensuse.org/viewcvs/yast?rev=38218&view=rev Log: - added help text for DHCP support (F120090) - removed Browse button (#240045) - 2.15.7 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/SambaNmbLookup.pm trunk/samba-client/src/dialogs.ycp trunk/samba-client/src/helps.ycp trunk/samba-client/src/routines.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=38218&r… ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Thu May 31 10:32:55 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba… ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Thu May 31 10:32:55 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 09:27:44 CEST 2007 - jsuchome(a)suse.cz + +- added help text for DHCP support (F120090) +- removed Browse button (#240045) +- 2.15.7 + +------------------------------------------------------------------- Thu May 17 13:44:22 CEST 2007 - jsuchome(a)suse.cz - fix deleting shares from smb.conf (#264834) Modified: trunk/samba-client/src/SambaNmbLookup.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/SambaNmbLookup.… ============================================================================== --- trunk/samba-client/src/SambaNmbLookup.pm (original) +++ trunk/samba-client/src/SambaNmbLookup.pm Thu May 31 10:32:55 2007 @@ -207,29 +207,4 @@ return FALSE; } -# Return a list of workgroups and domains already existing in the lan. -# @return list<string> of found workgroups/domains -BEGIN{$TYPEINFO{GetAvailableNeighbours}=["function",["list", "string"], "string"]} -sub GetAvailableNeighbours { - my ($self, $domain_suffix) = @_; - $domain_suffix = "" unless $domain_suffix; - - checkNmbstatus(); - - # TODO: inform user about problems - return [ map {$_ . ($self->IsDomain($_)?$domain_suffix:"")} sort keys %Nmbstatus_output ]; -} - -# Return a list of domains already existing in the lan. -# @return list<string> of found workgroups/domains -BEGIN{$TYPEINFO{GetAvailableDomains}=["function",["list", "string"]]} -sub GetAvailableDomains { - my ($self) = @_; - - checkNmbstatus(); - - # TODO: inform user about problems - return [ grep {$self->IsDomain($_)} sort keys %Nmbstatus_output ]; -} - 8; Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev… ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Thu May 31 10:32:55 2007 @@ -45,7 +45,9 @@ boolean dhcp_support = Samba::GetDHCP (); // help text, do not translate 'winbind uid', 'winbind gid' - string help_text = _("Specify the range for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values)."); + string help_text = _("Specify the range for Samba user and group IDs (<tt>winbind uid</tt> and <tt>winbind gid</tt> values).") + + + DHCPSupportHelp (); UI::OpenDialog (`opt (`decorated), `HBox ( `HWeight (1, `RichText (`id (`help), help_text)), @@ -213,12 +215,7 @@ `TextEntry(`id(`workgroup), (Stage::cont() ? _("&Domain") : // translators: text entry label - _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()), - `VBox ( - `Label(""), - // translators: push button label - `PushButton(`id(`browse), _("Br&owse...")) - ) + _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()) ), status_term, winbind_term, @@ -267,9 +264,6 @@ Wizard::HideBackButton(); check_domain_membership (Samba::GetWorkgroupOrRealm()); } - if (Mode::config ()) { - UI::ChangeWidget (`id(`browse), `Enabled, false); - } any ret = nil; while(true) { @@ -436,15 +430,6 @@ ")); } break; - } else if (ret == `browse) { - - string new_workgroup = BrowseNeighbours( Stage::cont() ); - if( new_workgroup != nil && new_workgroup != "" ) { - // fill in the new workgroup name - UI::ChangeWidget( `id(`workgroup), `Value, new_workgroup ); - check_domain_membership (new_workgroup); - } - continue; } else if (ret == `back ) { break; } Modified: trunk/samba-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/helps.ycp?rev=3… ============================================================================== --- trunk/samba-client/src/helps.ycp (original) +++ trunk/samba-client/src/helps.ycp Thu May 31 10:32:55 2007 @@ -42,9 +42,7 @@ "MembershipDialog_nocont" : _("<big>Selecting Windows Domain Membership</big>") /* translators: Samba workgroup dialog help 1/3 */ + _("A Linux client can be a member of a workgroup, NT domain, or Active Directory domain. -Here, specify the name of the membership. Browse -presents the list of all workgroups and domains found in the -network. +Here, specify the name of the membership. ") + /* Samba role dialog help 2/3 */ @@ -60,8 +58,7 @@ /* translators: Samba membership dialog help title (installation) */ "MembershipDialog_cont" : _("<big>Selecting Windows Domain Membership</big>") /* translators: Samba membership dialog help 1/2 (installation) */ -+ _("Specify the name of the NT or Active Directory domain. Browse -presents the list of all domains found in the network. ++ _("Specify the name of the NT or Active Directory domain. ") /* translators: Samba membership dialog help 2/2 (installation) */ + _("When you press Next, the system verifies the domain and Modified: trunk/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/routines.ycp?re… ============================================================================== --- trunk/samba-client/src/routines.ycp (original) +++ trunk/samba-client/src/routines.ycp Thu May 31 10:32:55 2007 @@ -168,57 +168,8 @@ if (!res) { return `nojoin; } - return JoinDomain(workgroup); } - - -/** - * Show a selection popup to select a workgroup from the ones existing on LAN. - * - * @return string chosen workgroup or nil if cancelled - */ -define string BrowseNeighbours(boolean domains_only) ``{ - list<string> groups = nil; - - UI::OpenDialog ( - // popup window - `Label (_("Looking for available workgroups and domains..."))); - - UI::BusyCursor (); - - if (domains_only) { - groups = SambaNmbLookup::GetAvailableDomains(); - } else { - groups = SambaNmbLookup::GetAvailableNeighbours(_(" (Domain)")); - } - - UI::CloseDialog (); - if( groups == nil ) return nil; - groups = filter (string group, groups, ``(size (group) > 0)); - - // let the user choose a workgroup - UI::OpenDialog( `VBox( - `HSpacing (36), - // translators: selection box label - `SelectionBox(`id(`selection), (domains_only ? _("&Existing Domains") : _("&Existing Neighbours")), groups), - `HBox( - `PushButton( `id(`ok), Label::OKButton() ), - `PushButton( `id(`cancel), Label::CancelButton() ) - ) - ) ); - - any ret = UI::UserInput(); - string sel = (string) UI::QueryWidget( `id(`selection), `CurrentItem ); - // textentry constant (automatically added to some kind of values) - if ( sel != nil && issubstring (sel, _(" (Domain)") ) ) - { - integer pos = search (sel, _(" (Domain)") ); - sel = (pos == nil) ? sel : substring (sel, 0, pos); - } - UI::CloseDialog(); - return ret == `ok ? sel : nil; -} /** @@ -281,6 +232,15 @@ } /** + * return the help text for DHCP support + */ +define string DHCPSupportHelp () { + + // help text ("Retrieve WINS server via DHCP" is a checkbox label) + return _("Check Retrieve WINS server via DHCP to use a WINS server provided by DHCP."); +} + +/** * return the term with shares settings * @param settings map with parameters to show in term */ -- 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] r38217 - /trunk/ncurses/src/NCPackageSelectorPlugin.h
by gs＠svn.opensuse.org 31 May '07

31 May '07

Author: gs Date: Thu May 31 10:29:03 2007 New Revision: 38217 URL: http://svn.opensuse.org/viewcvs/yast?rev=38217&view=rev Log: comment corrected Modified: trunk/ncurses/src/NCPackageSelectorPlugin.h Modified: trunk/ncurses/src/NCPackageSelectorPlugin.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPackageSelectorPlu… ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPlugin.h (original) +++ trunk/ncurses/src/NCPackageSelectorPlugin.h Thu May 31 10:29:03 2007 @@ -35,7 +35,7 @@ public: /** - * Constructor: Load the plugin library for the Qt package selector. + * Constructor: Load the plugin library for the NCurses package selector. **/ NCPackageSelectorPlugin(); -- 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] r38216 - /trunk/ncurses/src/pkg/Makefile.am
by gs＠svn.opensuse.org 31 May '07

31 May '07

Author: gs Date: Thu May 31 10:27:28 2007 New Revision: 38216 URL: http://svn.opensuse.org/viewcvs/yast?rev=38216&view=rev Log: remove $(wildcard *.h) Modified: trunk/ncurses/src/pkg/Makefile.am Modified: trunk/ncurses/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/Makefile.am?rev=… ============================================================================== --- trunk/ncurses/src/pkg/Makefile.am (original) +++ trunk/ncurses/src/pkg/Makefile.am Thu May 31 10:27:28 2007 @@ -17,7 +17,7 @@ -L$(libdir) -lyui \ ${ZYPP_LIBS} -noinst_HEADERS = $(wildcard *.h) \ +noinst_HEADERS = \ NCPackageSelector.h \ NCPkgSelMapper.h \ NCPkgStatusStrategy.h \ @@ -31,7 +31,7 @@ NCPkgNames.h \ NCZypp.h -libpy2ncurses_pkg_la_SOURCES = \ +libpy2ncurses_pkg_la_SOURCES = \ NCPackageSelector.cc \ NCPkgSelMapper.cc \ NCPkgStatusStrategy.cc \ -- 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] r38215 - /trunk/mail/package/yast2-mail.changes
by varkoly＠svn.opensuse.org 30 May '07

30 May '07

Author: varkoly Date: Wed May 30 21:11:54 2007 New Revision: 38215 URL: http://svn.opensuse.org/viewcvs/yast?rev=38215&view=rev Log: new build 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 Wed May 30 21:11:54 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 21:00:17 CEST 2007 - varkoly(a)suse.de + +- move sysconfig.mail from aaa_base +- include first version of the wizard to decide wich kind of + mail configuration will be done + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) -- 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] r38214 - in /trunk/mail: agents/Makefile.am agents/sysconfig.mail src/sysconfig.mail yast2-mail.spec.in
by varkoly＠svn.opensuse.org 30 May '07

30 May '07

Author: varkoly Date: Wed May 30 20:57:59 2007 New Revision: 38214 URL: http://svn.opensuse.org/viewcvs/yast?rev=38214&view=rev Log: include the sysconfig file from aaa_base Added: trunk/mail/agents/sysconfig.mail Removed: trunk/mail/src/sysconfig.mail Modified: trunk/mail/agents/Makefile.am trunk/mail/yast2-mail.spec.in Modified: trunk/mail/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/agents/Makefile.am?rev=3821… ============================================================================== --- trunk/mail/agents/Makefile.am (original) +++ trunk/mail/agents/Makefile.am Wed May 30 20:57:59 2007 @@ -37,6 +37,7 @@ mail_cyrusconf.scr \ cfg_fetchmail.scr +fillup_DATA = sysconfig.mail # ag_fetchmailrc is tested in testsuite dir TESTS = test-mailtable @@ -49,4 +50,4 @@ test-mailtable-4.in test-mailtable-4.out \ test-mailtable-18487.in test-mailtable-18487.out -EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) $(TESTS) $(testdata) +EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) $(TESTS) $(testdata) $(fillup_DATA) Added: trunk/mail/agents/sysconfig.mail URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/agents/sysconfig.mail?rev=3… ============================================================================== --- trunk/mail/agents/sysconfig.mail (added) +++ trunk/mail/agents/sysconfig.mail Wed May 30 20:57:59 2007 @@ -0,0 +1,49 @@ +## Path: Network/Mail/General +## Description: +## Type: string +## Default: "" +## Config: postfix +## ServiceReload: sendmail,postfix +# +# From:-Line in email and News postings +# (otherwise the FQDN is used) +# +FROM_HEADER="" + +## Path: Network/Mail/General +## Description: Basic general MTA configuration +## Type: yesno +## Default: yes +## Config: postfix,sendmail +# +# If you don't want to let SuSEconfig generate your +# configuration file, set this to no +# +MAIL_CREATE_CONFIG="yes" + +## Type: yesno +## Default: no +## Config: postfix +# +# Set this to "yes" if mail from remote should be accepted +# this is necessary for any mail server. +# If set to "no" or empty then only mail from localhost +# will be accepted. +# +SMTPD_LISTEN_REMOTE="yes" + +## Type: yesno +## Default: no +# +# Set this to "yes" if the yast2 mail module must not +# start with the with the vizard for asking the +# configuration type of the mail server. +# +MAIL_SKIP_ASK="no" + +## Type: string(standard,advanced,undef) +## Default: undef +# +# This variable contains the type of the mail server configuration. +# +MAIL_CONF_TYPE="undef" Modified: trunk/mail/yast2-mail.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/yast2-mail.spec.in?rev=3821… ============================================================================== --- trunk/mail/yast2-mail.spec.in (original) +++ trunk/mail/yast2-mail.spec.in Wed May 30 20:57:59 2007 @@ -3,6 +3,9 @@ @HEADER@ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite BuildRequires: yast2-perl-bindings yast2-ldap-server yast2-users yast2-network + +PreReq: %fillup_prereq + # new firewall interface Requires: yast2 >= 2.11.11 Requires: yast2-users @@ -45,6 +48,9 @@ @CLEAN@ +%post +%{fillup_only -n mail} + %files %defattr(-,root,root) %dir @yncludedir@/mail @@ -55,6 +61,7 @@ @moduledir@/Mail.ybc @moduledir@/MailServer.ybc @moduledir@/MailServer.ycp +@moduledir@/MailServerLDAP.pm @moduledir@/Mail.ycp %dir @moduledir@/YaPI @moduledir@/YaPI/Mail* @@ -105,6 +112,8 @@ @agentdir@/ag_fetchmailrc @agentdir@/ag_mailtable +@fillupdir@/sysconfig.mail + %files plugins %defattr(-,root,root) %dir @moduledir@ -- 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] r38213 - in /trunk/mail: permissions/ src/ src/YaPI/ users-plugin/
by varkoly＠svn.opensuse.org 30 May '07

30 May '07

Author: varkoly Date: Wed May 30 20:07:53 2007 New Revision: 38213 URL: http://svn.opensuse.org/viewcvs/yast?rev=38213&view=rev Log: introducing the start wizard to choose the configuration type Added: trunk/mail/src/MailServerLDAP.pm trunk/mail/src/mail-advanced.ycp trunk/mail/src/mail-server_ldap-setup.ycp trunk/mail/src/mail-standard.ycp trunk/mail/src/sysconfig.mail Modified: trunk/mail/permissions/Makefile.in trunk/mail/src/MailServer.ycp trunk/mail/src/Makefile.am trunk/mail/src/YaPI/MailServer.pm trunk/mail/src/mail-server_dialogs.ycp trunk/mail/src/mail-server_wizards.ycp trunk/mail/src/mail.ycp trunk/mail/users-plugin/Makefile.in Modified: trunk/mail/permissions/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/permissions/Makefile.in?rev… ============================================================================== --- trunk/mail/permissions/Makefile.in (original) +++ trunk/mail/permissions/Makefile.in Wed May 30 20:07:53 2007 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,15 +19,11 @@ # Makefile.am.common -*- Makefile -*- # Generated file, do not edit! -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -71,15 +67,12 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ -CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ -CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ -CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -90,6 +83,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MYEXPECT = @MYEXPECT@ MYRUNTEST = @MYRUNTEST@ PACKAGE = @PACKAGE@ @@ -111,10 +105,14 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ -ac_ct_STRIP = @ac_ct_STRIP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ agentdir = @agentdir@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ @@ -125,10 +123,13 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ clientdir = @clientdir@ datadir = @datadir@ +datarootdir = @datarootdir@ desktopdir = @desktopdir@ docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ execcompdir = @execcompdir@ fillupdir = @fillupdir@ @@ -137,6 +138,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -149,16 +151,19 @@ mkdir_p = @mkdir_p@ moduledir = @moduledir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgconfigdatadir = @pkgconfigdatadir@ pkgconfigdir = @pkgconfigdir@ plugindir = @plugindir@ potdir = @potdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ schemadir = @schemadir@ scrconfdir = @scrconfdir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ @@ -166,6 +171,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ themedir = @themedir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ yast2dir = @yast2dir@ ybindir = @ybindir@ ydatadir = @ydatadir@ @@ -186,6 +193,7 @@ # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. NEWDEP = ${top_builddir}/.dep.new +CHECK_SYNTAX = true all: all-am .SUFFIXES: @@ -218,10 +226,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-modulebinDATA: $(modulebin_DATA) @$(NORMAL_INSTALL) - test -z "$(modulebindir)" || $(mkdir_p) "$(DESTDIR)$(modulebindir)" + test -z "$(modulebindir)" || $(MKDIR_P) "$(DESTDIR)$(modulebindir)" @list='$(modulebin_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -238,7 +245,7 @@ done install-permissionsDATA: $(permissions_DATA) @$(NORMAL_INSTALL) - test -z "$(permissionsdir)" || $(mkdir_p) "$(DESTDIR)$(permissionsdir)" + test -z "$(permissionsdir)" || $(MKDIR_P) "$(DESTDIR)$(permissionsdir)" @list='$(permissions_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -261,23 +268,21 @@ distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -296,7 +301,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(permissionsdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -344,12 +349,20 @@ install-data-am: install-modulebinDATA install-permissionsDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -368,18 +381,20 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-modulebinDATA \ - uninstall-permissionsDATA +uninstall-am: uninstall-modulebinDATA uninstall-permissionsDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic dist-hook \ distclean distclean-generic distdir dvi dvi-am html html-am \ info info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-modulebinDATA install-permissionsDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-modulebinDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-modulebinDATA install-pdf install-pdf-am \ + install-permissionsDATA install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-modulebinDATA \ uninstall-permissionsDATA @@ -396,9 +411,19 @@ rm ${NEWDEP} dist-hook: check-syntax - check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep # Tell versions [3.59,3.63) of GNU make to not export all variables. Modified: trunk/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=3821… ============================================================================== --- trunk/mail/src/MailServer.ycp (original) +++ trunk/mail/src/MailServer.ycp Wed May 30 20:07:53 2007 @@ -366,9 +366,6 @@ return false; } } - if( SCR::Read(.target.size, "/var/adm/yast2-mail-server-used") < 0) { - YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,MailServer::LDAPDefaults); - } NetworkDevices::Read(); map<string,map> TMP = NetworkDevices::Export("modem"); Added: trunk/mail/src/MailServerLDAP.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServerLDAP.pm?rev=3… ============================================================================== --- trunk/mail/src/MailServerLDAP.pm (added) +++ trunk/mail/src/MailServerLDAP.pm Wed May 30 20:07:53 2007 @@ -0,0 +1,97 @@ +=head1 NAME + +MailServerLDAP + +=head1 PREFACE + +This package is a part of the YaST2 mail modul. + +=head1 SYNOPSIS + +use MailServerLDAP + + +=head1 DESCRIPTION + +B<MailServerLDAP> provides a function ConfigureLDAPServer that makes the local +LDAP server able to store the tables of the mail server. + +=over 2 + +=cut + +package MailServerLDAP; + +use strict; + +use YaST::YCP; + +textdomain("MailServer"); + +our %TYPEINFO; + +YaST::YCP::Import ("Ldap"); +YaST::YCP::Import ("YaPI::LdapServer"); + + +sub ConfigureLDAPServer() +{ + # don't configure if using eDirectory server + Ldap->CheckNDS (); + if (! Ldap->nds()) + { + # Now we configure the LDAP-Server to be able store the mail server configuration + my $schemas = YaPI::LdapServer->ReadSchemaIncludeList(); + my $SCHEMA = join "",@{$schemas}; + if( $SCHEMA !~ /dnszone.schema/ ) + { + push @{$schemas},'/etc/openldap/schema/dnszone.schema'; + } + if( $SCHEMA !~ /suse-mailserver.schema/ ) + { + push @{$schemas},'/etc/openldap/schema/suse-mailserver.schema'; + YaPI::LdapServer->WriteSchemaIncludeList($schemas); + my $indices = YaPI::LdapServer->ReadIndex($ldapMap->{ldap_domain}); + my $SuSEMailClient = 0; + my $SuSEMailDomainMasquerading = 0; + my $suseTLSPerSitePeer= 0; + foreach my $index (@{$indices}) + { + if( $index->{attr} eq "SuSEMailClient,SUSEMailAcceptAddress,zoneName") + { + $SuSEMailClient = 1; + } + if( $index->{attr} eq "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType") + { + $SuSEMailDomainMasquerading = 1; + } + if( $index->{attr} eq "suseTLSPerSitePeer,SuSEMailTransportDestination") + { + $suseTLSPerSitePeer = 1; + } + } + if(!$SuSEMailClient) + { + YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, + { "attr" => "SuSEMailClient,SUSEMailAcceptAddress,zoneName", + "param" => "eq" } + ); + } + if(!$SuSEMailDomainMasquerading) + { + YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, + { "attr" => "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType", + "param" => "eq" } + ); + } + if(!$SuSEMailClient) + { + YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, + { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination", + "param" => "eq" } + ); + } + YaPI::LdapServer->RecreateIndex($ldapMap->{ldap_domain}); + } + } +} Modified: trunk/mail/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Makefile.am?rev=38213&r… ============================================================================== --- trunk/mail/src/Makefile.am (original) +++ trunk/mail/src/Makefile.am Wed May 30 20:07:53 2007 @@ -12,8 +12,8 @@ client_DATA = \ mail.ycp \ mail_auto.ycp \ - \ - mail-server.ycp \ + mail-standard.ycp \ + mail-advanced.ycp \ mail-server_auto.ycp \ mail-server_proposal.ycp @@ -34,7 +34,8 @@ module_DATA = \ Mail.ycp \ - MailServer.ycp + MailServer.ycp \ + MailServerLDAP.pm ldapschema_DATA = suse-mailserver.schema 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 Wed May 30 20:07:53 2007 @@ -43,13 +43,12 @@ our @CAPABILITIES = ( 'SLES10' ); -our $VERSION="1.1.0"; +our $VERSION="2.2.0"; YaST::YCP::Import ("SCR"); YaST::YCP::Import ("Service"); YaST::YCP::Import ("Ldap"); YaST::YCP::Import ("NetworkDevices"); -YaST::YCP::Import ("YaPI::LdapServer"); ## # @@ -2184,7 +2183,7 @@ The LDAP Base for the DNS Configuration The LDAP Base for the MAIL Configuration The LDAP Template for the MAIL Configuration -If the last two does not exist this will be created. +If the last there does not exist this will be created. The result is an hash of following structur: @@ -2575,65 +2574,6 @@ SCR->Write(".sysconfig.mail.MAIL_CREATE_CONFIG","no"); SCR->Write(".sysconfig.mail",undef); - # don't configure if using eDirectory server - Ldap->CheckNDS (); - if (! Ldap->nds()) - { - # Now we configure the LDAP-Server to be able store the mail server configuration - my $schemas = YaPI::LdapServer->ReadSchemaIncludeList(); - my $SCHEMA = join "",@{$schemas}; - if( $SCHEMA !~ /dnszone.schema/ ) - { - push @{$schemas},'/etc/openldap/schema/dnszone.schema'; - } - if( $SCHEMA !~ /suse-mailserver.schema/ ) - { - push @{$schemas},'/etc/openldap/schema/suse-mailserver.schema'; - YaPI::LdapServer->WriteSchemaIncludeList($schemas); - my $indices = YaPI::LdapServer->ReadIndex($ldapMap->{ldap_domain}); - my $SuSEMailClient = 0; - my $SuSEMailDomainMasquerading = 0; - my $suseTLSPerSitePeer= 0; - foreach my $index (@{$indices}) - { - if( $index->{attr} eq "SuSEMailClient,SUSEMailAcceptAddress,zoneName") - { - $SuSEMailClient = 1; - } - if( $index->{attr} eq "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType") - { - $SuSEMailDomainMasquerading = 1; - } - if( $index->{attr} eq "suseTLSPerSitePeer,SuSEMailTransportDestination") - { - $suseTLSPerSitePeer = 1; - } - } - if(!$SuSEMailClient) - { - YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, - { "attr" => "SuSEMailClient,SUSEMailAcceptAddress,zoneName", - "param" => "eq" } - ); - } - if(!$SuSEMailDomainMasquerading) - { - YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, - { "attr" => "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType", - "param" => "eq" } - ); - } - if(!$SuSEMailClient) - { - YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, - { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination", - "param" => "eq" } - ); - } - YaPI::LdapServer->RecreateIndex($ldapMap->{ldap_domain}); - } - } - #Put user postfix into the group mail system($check_postfix); Added: trunk/mail/src/mail-advanced.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-advanced.ycp?rev=3… ============================================================================== --- trunk/mail/src/mail-advanced.ycp (added) +++ trunk/mail/src/mail-advanced.ycp Wed May 30 20:07:53 2007 @@ -0,0 +1,106 @@ +/** + * File: clients/mail-server.ycp + * Package: Configuration of mail-server + * Summary: Main file + * Authors: Peter Varkoly <varkoly(a)suse.de> + * + * $Id: mail-server.ycp 19955 2004-10-26 12:28:16Z varkoly $ + * + * Main file for mail-server configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of mail-server</h3> + */ + +textdomain "MailServer"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("MailServer module started"); + +import "Progress"; +import "Report"; +import "Summary"; +import "Popup"; +import "Label"; + +import "CommandLine"; +include "mail/mail-server_wizards.ycp"; + +map cmdline_description = $[ + "id" : "mail-server", + /* Command line help text for the mail-server module */ + "help" : _("Configuration of mail server"), + "guihandler" : MailServerSequence, + "initialize" : MailServer::Read, + "finish" : MailServer::Write, + "actions" : $[ + "setup" : $[ + "handler" : MailServerSequence, + "help" : _("Advanced Mail Server setup with LDAP backend"), + ], + ], + "options" : $[ + // FIXME TODO: fill the option descriptions here + ], + "mapping" : $[ + // FIXME TODO: fill the mappings of actions and options here + ] +]; + +/* analyze command line */ +boolean propose = false; +boolean setup = false; +list args = WFM::Args(); +if(size(args) > 0) { + if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) { + y2milestone("Using PROPOSE mode"); + propose = true; + } + if(contains(args,"setup")) { + y2milestone("Using setup mode"); + setup = true; + } +} + +/* + after merging yast2-mail and yast2-mail-server we have to be + carefull not to corrupt the configuration of the other modul +*/ +if( !setup && SCR::Read (.sysconfig.mail.MAIL_CREATE_CONFIG)== "yes" ) +{ + if( + ! Popup::AnyQuestionRichText( + Label::WarningMsg(), + _("You have configured your MTA without LDAP support. ") + + _("This modul will configure your MTA with LDAP support. ") + + _("This will corrupt your actuall configuration."), + 80, 10, + Label::ContinueButton(), + Label::CancelButton(), + `focus_no + ) + ) + { + return nil; + } +} + +/* main ui function */ +any ret = nil; + +if(propose) ret = MailServerAutoSequence(); +else ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +/* Finish */ +y2milestone("MailServer module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp… ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Wed May 30 20:07:53 2007 @@ -18,7 +18,6 @@ import "Service"; import "Users"; import "YaPI::MailServer"; -import "YaPI::LdapServer"; include "mail/helps.ycp"; @@ -29,11 +28,24 @@ */ define any AuthorizingDialog () { - string ERROR = ""; + string ERROR = _("You must configure LDAP to use the mail server."); Ldap::Read(); map LDAPSettings = Ldap::Export(); - if(LDAPSettings["base_config_dn"]:"" == "" ) { - ERROR = _("You must configure LDAP to use the mail server."); + if(LDAPSettings["ldap_server"]:"" == "" ) + { + ERROR = ERROR + "\n" + _("Now we will start the LDAP-Server setup vizard."); + if(Popup::YesNo(ERROR)) + { + return `ldapsetup; + } + else + { + return `abort; + } + Ldap::Read(); + } + if(LDAPSettings["base_config_dn"]:"" == "" ) + { ERROR = ERROR + "\n"; } Ldap::LDAPInit(); @@ -70,46 +82,7 @@ MailServer::CertExist = true; } - - string caption = _("Mail Server Administrator Authorization"); - term contents = `HBox( - `HStretch(), - `Password(`id(`password), _("&Enter the Password for LDAP Server:"), ""), - `HStretch() - ); - - Wizard::SetContentsButtons(caption, contents, HELPS["AuthorizingDialog"]:"", - Label::BackButton(), Label::NextButton()); - Wizard::SetDesktopIcon("mailserver"); - UI::WizardCommand(`SetBackButtonLabel( "" ) ); - UI::SetFocus (`id (`password)); - - any ret = nil; - while(true) { - - ret = UI::UserInput(); - - MailServer::AdminPassword = (string) UI::QueryWidget(`id(`password), `Value); - - /* abort? */ - if(ret == `abort || ret == `cancel) { - if(ReallyAbort()) break; - else continue; - } else if(ret == `next) { - MailServer::LDAPDefaults = (map<string,any>) YaPI::MailServer::ReadLDAPDefaults( - MailServer::AdminPassword); - if (MailServer::LDAPDefaults == nil) { - Popup::Error(_("Unable to Authorize the Administrator User")); - continue; - } - return ret; - } else { - y2error("unexpected retcode: %1", ret); - continue; - } - } - - return ret; + return Ldap::LDAPAskAndBind(false); } Added: trunk/mail/src/mail-server_ldap-setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_ldap-setup.… ============================================================================== --- trunk/mail/src/mail-server_ldap-setup.ycp (added) +++ trunk/mail/src/mail-server_ldap-setup.ycp Wed May 30 20:07:53 2007 @@ -0,0 +1,38 @@ +/** + * File: + * clients/mail-server-ldap-setup.ycp + * + * Package: + * Configuration of mail + * + * Summary: + * Setup of a LDAP server to be able store the mail server datas + * + * Authors: + * Peter Varkoly <varkoly(a)novell.com> + * + * $Id: mail.ycp 37642 2007-04-20 19:06:52Z varkoly $ + * + * + */ + +{ +textdomain "mail"; +import "Ldap"; +import "MailServerLDAP"; +import "YaPI::MailServer"; + + string ERROR = ""; + + y2milestone("--- mail-server-ldap-setup: Detgecting if we are LDAP-Client ---"); + Ldap::Read(); + map LDAPSettings = Ldap::Export(); + if(LDAPSettings["base_config_dn"]:"" == "" ) + { + y2milestone("--- mail-server-ldap-setup: We are not LDAP Client ---"); + } + y2milestone("--- mail-server-ldap-setup: We are LDAP Client ---"); + Ldap::LDAPInit(); + Ldap::LDAPAskAndBind(false); + YaPI::MailServer::ResetMailServer(); +} Modified: trunk/mail/src/mail-server_wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_wizards.ycp… ============================================================================== --- trunk/mail/src/mail-server_wizards.ycp (original) +++ trunk/mail/src/mail-server_wizards.ycp Wed May 30 20:07:53 2007 @@ -19,6 +19,31 @@ /** + * Workflow of the LDAP Server/Client setup + * @return sequence result + */ +any LdapSetupSequence() { + + /* FIXME: adapt to your needs */ + map aliases = $[ + "complex" : ``( ComplexDialog() ) + ]; + + /* FIXME: adapt to your needs */ + map sequence = $[ + "ws_start" : "complex", + "complex" : $[ + `abort : `abort, + `next : `next + ] + ]; + + any ret = Sequencer::Run(aliases, sequence); + + return ret; +} + +/** * Main workflow of the mail-server configuration * @return sequence result */ @@ -50,10 +75,11 @@ any MailServerSequence() { map aliases = $[ - "read" : [ ``( ReadDialog() ), true ], - "auth" : [ ``( AuthorizingDialog() ), true ], - "main" : ``( MainSequence() ), - "write" : [ ``( WriteDialog() ), true ] + "read" : [ ``( ReadDialog() ), true ], + "auth" : [ ``( AuthorizingDialog() ), true ], + "main" : ``( MainSequence() ), + "ldapsetup" : ``( LdapSetupSequence() ), + "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ Added: trunk/mail/src/mail-standard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-standard.ycp?rev=3… ============================================================================== --- trunk/mail/src/mail-standard.ycp (added) +++ trunk/mail/src/mail-standard.ycp Wed May 30 20:07:53 2007 @@ -0,0 +1,110 @@ +/** + * File: + * clients/mail.ycp + * + * Package: + * Configuration of mail + * + * Summary: + * Main file + * + * Authors: + * Martin Vidner <mvidner(a)suse.cz> + * Peter Varkoly <varkoly(a)novell.com> + * + * $Id: mail.ycp 37642 2007-04-20 19:06:52Z varkoly $ + * + * Main file for mail configuration. Uses all other files. + * + */ + +/** + * @param flag "permanent", "dialup", or "screenshots" + * <dl> + * <dt>permanent<dd>preselects permanent connnection + * <dt>dialup<dd>preselects dial-up connnection + * <dt>screenshots + * <dd>uses faked data (see Mail::Fake), enables running the module + * as non-root. (Uses Mode::screen_shot().) + * </dl> + */ +{ + /*** + * <h3>Configuration of the mail</h3> + */ + + textdomain "mail"; + + import "CommandLine"; + import "Mail"; + import "RichText"; + include "mail/ui.ycp"; + + /* The main () */ + y2milestone ("Mail standard module started"); + y2milestone ("----------------------------------------"); + + /* parse arguments */ + list args = WFM::Args (); + string first_arg = args[0]:""; + if (first_arg == "permanent") + { + preselect_connection_type = `permanent; + } + else if (first_arg == "dialup") + { + preselect_connection_type = `dialup; + } + + /** + * CLI action handler. + * Print summary in command line + * @param options command options + * @return false so that Write is not called in non-interactive mode + */ + define boolean MailSummaryHandler (map options) { + + CommandLine::Print (RichText::Rich2Plain (Mail::Summary ())); + return false; + } + + /** + * CLI initializer. + * @return whether successful + */ + define boolean MailRead () { + + block<boolean> callback = ``{ + return false; + }; + return Mail::Read (callback); + } + + + map cmdline_description = $[ + "id" : "mail", + /* Command line help text for the mail module */ + "help" : _("Configuration of mail"), + "guihandler" : MailSequence, + "initialize" : MailRead, + "finish" : Mail::Write, + "actions" : $[ + "summary" : $[ + "handler" : MailSummaryHandler, + // command line action help + "help" : _("Mail configuration summary"), + ], + ], + "mappings" : $[ + "summary" : [], + ] + ]; + /* main ui function */ + any ret = (preselect_connection_type == nil) ? + CommandLine::Run (cmdline_description) : MailSequence (); + y2debug ("ret == %1", ret); + + /* Finish */ + y2milestone ("Mail standard module finished"); + return ret; +} Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=38213&r1=3… ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Wed May 30 20:07:53 2007 @@ -10,6 +10,7 @@ * * Authors: * Martin Vidner <mvidner(a)suse.cz> + * Peter Varkoly <varkoly(a)novell.com> * * $Id$ * @@ -34,102 +35,167 @@ textdomain "mail"; - import "CommandLine"; - import "Mail"; - import "RichText"; + import "Wizard"; import "Popup"; import "Label"; - include "mail/ui.ycp"; /* The main () */ y2milestone ("Mail module started"); y2milestone ("----------------------------------------"); - /* parse arguments */ - list args = WFM::Args (); - string first_arg = args[0]:""; - if (first_arg == "permanent") + /* The maske to select the type of the configuration */ +define string StartDialogHelp () ``{ + return + // Translators: start dialog help, part 1 of 4 + _("Email Server Configuration ") + + // Translators: start dialog help, part 2 of 4 + _("This module will configure and start Postfix and if necessary the Cyrus IMAP Server.")+ + // Translators: start dialog help, part 3 of 4 + _("Be aware:\nMost home users can use the build-in +features of their email application to send and +get email. They do not need this module.")+ + // Translators: start dialog help, part 4 of 4 + _("You will need Postfix only if you want to store +the email on your local system, or in some other special cases."); +} + +define string StartDialog (string type) ``{ + + y2milestone ("Mail configuration type %1", type); + + Wizard::SetScreenShotName ("mail-0-start"); + string caption = _("Email Server Configuration"); + term tskip_ask = `Left(`CheckBox(`id(`skip_ask), _("Skip this page in the future"))); + string status = _("Mail Server is not configured. +Select configuration type according your personal needs"); + if( type == "standard" ) { - preselect_connection_type = `permanent; + status = _("The running Mail Server configuration is based on type âStandardâ. +It's possible to change to âAdvancedâ, but this will overwrite all existing settings."); } - else if (first_arg == "dialup") + else if( type == "advanced" ) { - preselect_connection_type = `dialup; + status = _("The running Mail Server configuration is based on type âAdvancedâ. +It's possible to change to âStandardâ, but this will overwrite all existing settings."); } - - /** - * CLI action handler. - * Print summary in command line - * @param options command options - * @return false so that Write is not called in non-interactive mode - */ - define boolean MailSummaryHandler (map options) { - - CommandLine::Print (RichText::Rich2Plain (Mail::Summary ())); - return false; + if( type != "standard" && type != "advanced" ) + { + tskip_ask = `VSpacing(1); + } + term contents = + `Frame( + "", + `VBox( + `Left(`Label(status)), + `RadioButtonGroup( `id( `conf_type ), + `VBox( + `VSpacing(1), + `Left(`RadioButton(`id("standard"),_("Standard"), type == "standard" )), + `VSpacing(1), + `Left(`RadioButton(`id("advanced"),_("Advanced"), type == "advanced" )), + `VSpacing(1) + ) + ), + tskip_ask, + `VSpacing(1) + ) + ); + Wizard::CreateDialog(); + Wizard::SetContentsButtons (caption, contents, StartDialogHelp (), Label::BackButton (), Label::NextButton ()); + + any ret = nil; + string sret = nil; + while (true) + { + ret = UI::UserInput (); + if (ret == `cancel) + { + ret = `abort; + } + + if (ret == `back || (ret == `abort )) + { + break; + } + + if (ret == `next ) + { + if( (boolean) UI::QueryWidget (`id (`skip_ask), `Value) ) + { + SCR::Write (.sysconfig.mail.SKIP_ASK, "yes"); + } + else + { + SCR::Write (.sysconfig.mail.SKIP_ASK, "no"); + } + sret = (string) UI::QueryWidget (`id (`conf_type), `CurrentButton); + if( sret == nil ) + { + Popup::Error(_("You have to select a configuration type")); + continue; + } + SCR::Write (.sysconfig.mail.CONFIG_TYPE, sret); + y2milestone ("Mail configuration type %1", sret); + break; + } } + UI::CloseDialog(); + return sret; - /** - * CLI initializer. - * @return whether successful - */ - define boolean MailRead () { +} + + /* parse arguments */ + list args = WFM::Args (); - block<boolean> callback = ``{ - return false; - }; - return Mail::Read (callback); - } - - map cmdline_description = $[ - "id" : "mail", - /* Command line help text for the mail module */ - "help" : _("Configuration of mail"), - "guihandler" : MailSequence, - "initialize" : MailRead, - "finish" : Mail::Write, - "actions" : $[ - "summary" : $[ - "handler" : MailSummaryHandler, - // command line action help - "help" : _("Mail configuration summary"), - ], - ], - "mappings" : $[ - "summary" : [], - ] - ]; - - /* - after merging yast2-mail and yast2-mail-server we have to be - carefull not to corrupt the configuration of the other modul - */ + /* we collect some informations from the system */ + any ret = nil; + string skip_ask = "no"; + string conf_type = "undef"; + skip_ask = (string) SCR::Read (.sysconfig.mail.SKIP_ASK); + conf_type = (string) SCR::Read (.sysconfig.mail.CONFIG_TYPE); + boolean first_start = false; map local_recipient_maps = (map) SCR::Read (.mail.ldaptable, "local_recipient_maps"); -y2milestone("local_recipient_maps: %1",local_recipient_maps); - if( local_recipient_maps != nil ) + + if( conf_type != "advanced" && conf_type != "standard" ) + { // First start of mail modul or update from < 10.3 + y2milestone ("Warum bin i here Mail configuration type %1", conf_type); + if( local_recipient_maps != nil ) + { // Postfix configured using LDAP + conf_type = "advanced"; + } + else + { + conf_type = "standard"; + } + first_start = true; + } + if( skip_ask == "no" || skip_ask == nil ) { - if( - ! Popup::AnyQuestionRichText( - Label::WarningMsg(), - _("You have configured your MTA with LDAP support. ") + - _("This modul will configure your MTA without LDAP support. ") + - _("This will corrupt your actuall configuration."), - 80, 10, - Label::ContinueButton(), - Label::CancelButton(), - `focus_no - ) - ) - { - return nil; - } - } - - /* main ui function */ - any ret = (preselect_connection_type == nil) ? - CommandLine::Run (cmdline_description) : MailSequence (); + string old_conf = conf_type; + conf_type = StartDialog(conf_type); + if( conf_type == nil ) + { + y2milestone("no mail server configuration type"); + return ret; + } + if( old_conf != conf_type ) + { + first_start = true; + } + } - y2debug ("ret == %1", ret); + if( conf_type == "advanced" ) + { + if( first_start ) + { + args[size(args)] = "setup"; + } + ret = WFM::CallFunction("mail-advanced",args); + } + else + { + ret = WFM::CallFunction("mail-standard",args); + } /* Finish */ y2milestone ("Mail module finished"); Added: trunk/mail/src/sysconfig.mail URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/sysconfig.mail?rev=3821… ============================================================================== --- trunk/mail/src/sysconfig.mail (added) +++ trunk/mail/src/sysconfig.mail Wed May 30 20:07:53 2007 @@ -0,0 +1,49 @@ +## Path: Network/Mail/General +## Description: +## Type: string +## Default: "" +## Config: postfix +## ServiceReload: sendmail,postfix +# +# From:-Line in email and News postings +# (otherwise the FQDN is used) +# +FROM_HEADER="" + +## Path: Network/Mail/General +## Description: Basic general MTA configuration +## Type: yesno +## Default: yes +## Config: postfix,sendmail +# +# If you don't want to let SuSEconfig generate your +# configuration file, set this to no +# +MAIL_CREATE_CONFIG="yes" + +## Type: yesno +## Default: no +## Config: postfix +# +# Set this to "yes" if mail from remote should be accepted +# this is necessary for any mail server. +# If set to "no" or empty then only mail from localhost +# will be accepted. +# +SMTPD_LISTEN_REMOTE="yes" + +## Type: yesno +## Default: no +# +# Set this to "yes" if the yast2 mail module must not +# start with the with the vizard for asking the +# configuration type of the mail server. +# +MAIL_SKIP_ASK="no" + +## Type: string(standard,advanced,undef) +## Default: undef +# +# This variable contains the type of the mail server configuration. +# +MAIL_CONF_TYPE="undef" Modified: trunk/mail/users-plugin/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/users-plugin/Makefile.in?re… ============================================================================== --- trunk/mail/users-plugin/Makefile.in (original) +++ trunk/mail/users-plugin/Makefile.in Wed May 30 20:07:53 2007 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,15 +19,11 @@ # Makefile.am.common -*- Makefile -*- # Generated file, do not edit! -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -72,15 +68,12 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ -CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ -CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ -CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -91,6 +84,7 @@ LTLIBOBJS = @LTLIBOBJS@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MYEXPECT = @MYEXPECT@ MYRUNTEST = @MYRUNTEST@ PACKAGE = @PACKAGE@ @@ -112,10 +106,14 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ -ac_ct_STRIP = @ac_ct_STRIP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ agentdir = @agentdir@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ @@ -126,10 +124,13 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ clientdir = @clientdir@ datadir = @datadir@ +datarootdir = @datarootdir@ desktopdir = @desktopdir@ docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ execcompdir = @execcompdir@ fillupdir = @fillupdir@ @@ -138,6 +139,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ +htmldir = @htmldir@ imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -150,16 +152,19 @@ mkdir_p = @mkdir_p@ moduledir = @moduledir@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgconfigdatadir = @pkgconfigdatadir@ pkgconfigdir = @pkgconfigdir@ plugindir = @plugindir@ potdir = @potdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ sbindir = @sbindir@ schemadir = @schemadir@ scrconfdir = @scrconfdir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ @@ -167,6 +172,8 @@ target_os = @target_os@ target_vendor = @target_vendor@ themedir = @themedir@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ yast2dir = @yast2dir@ ybindir = @ybindir@ ydatadir = @ydatadir@ @@ -192,6 +199,7 @@ # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. NEWDEP = ${top_builddir}/.dep.new +CHECK_SYNTAX = true all: all-am .SUFFIXES: @@ -224,10 +232,9 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-clientDATA: $(client_DATA) @$(NORMAL_INSTALL) - test -z "$(clientdir)" || $(mkdir_p) "$(DESTDIR)$(clientdir)" + test -z "$(clientdir)" || $(MKDIR_P) "$(DESTDIR)$(clientdir)" @list='$(client_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -244,7 +251,7 @@ done install-moduleDATA: $(module_DATA) @$(NORMAL_INSTALL) - test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" + test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" @list='$(module_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -261,7 +268,7 @@ done install-modulebinDATA: $(modulebin_DATA) @$(NORMAL_INSTALL) - test -z "$(modulebindir)" || $(mkdir_p) "$(DESTDIR)$(modulebindir)" + test -z "$(modulebindir)" || $(MKDIR_P) "$(DESTDIR)$(modulebindir)" @list='$(modulebin_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -284,23 +291,21 @@ distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -319,7 +324,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -368,12 +373,20 @@ install-data-am: install-clientDATA install-moduleDATA \ install-modulebinDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -392,19 +405,23 @@ ps-am: -uninstall-am: uninstall-clientDATA uninstall-info-am \ - uninstall-moduleDATA uninstall-modulebinDATA +uninstall-am: uninstall-clientDATA uninstall-moduleDATA \ + uninstall-modulebinDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic dist-hook \ distclean distclean-generic distdir dvi dvi-am html html-am \ info info-am install install-am install-clientDATA \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-moduleDATA \ - install-modulebinDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-clientDATA \ - uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA + install-modulebinDATA install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ + uninstall-am uninstall-clientDATA uninstall-moduleDATA \ + uninstall-modulebinDATA # suffix mapping: info '(make)Static Usage' @@ -420,9 +437,19 @@ rm ${NEWDEP} dist-hook: check-syntax - check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep # Tell versions [3.59,3.63) of GNU make to not export all variables. -- 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] r38212 - /tags/stable-2_15_5/ftp-server/
by juhliarik＠svn.opensuse.org 30 May '07

30 May '07

Author: juhliarik Date: Wed May 30 18:38:19 2007 New Revision: 38212 URL: http://svn.opensuse.org/viewcvs/yast?rev=38212&view=rev Log: Created tag stable-2_15_5 for ftp-server Added: tags/stable-2_15_5/ftp-server/ - copied from r38211, trunk/ftp-server/ -- 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] r38211 - in /trunk/ftp-server: VERSION package/yast2-ftp-server.changes
by juhliarik＠svn.opensuse.org 30 May '07

30 May '07

Author: juhliarik Date: Wed May 30 18:37:52 2007 New Revision: 38211 URL: http://svn.opensuse.org/viewcvs/yast?rev=38211&view=rev Log: added patch for uploading anonymous users via vsftpd Modified: trunk/ftp-server/VERSION trunk/ftp-server/package/yast2-ftp-server.changes Modified: trunk/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/VERSION?rev=38211&r1=… ============================================================================== --- trunk/ftp-server/VERSION (original) +++ trunk/ftp-server/VERSION Wed May 30 18:37:52 2007 @@ -1 +1 @@ -2.15.4 +2.15.5 Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-ser… ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Wed May 30 18:37:52 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 17:31:06 CEST 2007 - juhliarik(a)suse.cz + +- added patch for uploading anonymous users via vsftpd +- added creation "upload" subdirectory with writing permission +- V 2.15.5 + +------------------------------------------------------------------- Thu May 10 13:51:53 CEST 2007 - juhliarik(a)suse.cz - added corrections for starting daemon via "when booting" -- 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] r38210 - /branches/tmp/sh/mod-ui/core/libyui/src/
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 18:25:05 2007 New Revision: 38210 URL: http://svn.opensuse.org/viewcvs/yast?rev=38210&view=rev Log: Property handling Added: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Wed May 30 18:25:05 2007 @@ -19,6 +19,7 @@ YUI_util.cc \ YUIPlugin.cc \ YUIException.cc \ + YProperty.cc \ \ YAlignment.cc \ YBarGraph.cc \ @@ -80,6 +81,7 @@ YUIPlugin.h \ YPackageSelectorPlugin.h \ YUIException.h \ + YProperty.h \ ImplPtr.h \ \ YAlignment.h \ Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h Wed May 30 18:25:05 2007 @@ -43,6 +43,28 @@ */ virtual char *widgetClass() { return "YCheckBox"; } +#if 0 + /** + * Set a property. + * Reimplemented from YWidget. + * + * This method may throw exceptions, for example + * - if there is no property with that name + * - if the expected type and the type mismatch + * - if the value is out of range + **/ + virtual void setProperty( const YProperty & prop ); + + /** + * Get a property. + * Reimplemented from YWidget. + * + * This method may throw exceptions, for example + * - if there is no property with that name + **/ + virtual YProperty getProperty( const std::string & propertyName ); +#endif + /** * Implements the ui command changeWidget. */ Added: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc Wed May 30 18:25:05 2007 @@ -0,0 +1,120 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| | +| (c) SuSE Linux Products GmbH | +\----------------------------------------------------------------------/ + + File: YProperty.cc + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#include "YProperty.h" + + + +#if 0 +using namespace YUI; +#endif + + +std::string +YProperty::typeAsStr( YPropertyType type ) +{ + switch ( type ) + { + case YUnknownPropertyType: return "<Unknown>"; + case YOtherProperty: return "<Other>"; + case YStringProperty: return "String"; + case YBoolProperty: return "Bool"; + case YIntegerProperty: return "Integer"; + + // Intentionally omitting default branch + // so the compiler catches unhandled enum values + } + + return "<Undefined property type>"; +} + + + +YPropertySet::YPropertySet() +{ + // NOP +} + + +YPropertySet::SearchResult +YPropertySet::lookup( const std::string & propertyName ) const +{ + for ( std::vector<YProperty>::const_iterator it = _properties.begin(); + it != _properties.end(); + ++it ) + { + if ( it->name() == propertyName ) + return Found; + } + + return NotFound; +} + + +YPropertySet::SearchResult +YPropertySet::lookup( const std::string & propertyName, YPropertyType type ) const +{ + for ( std::vector<YProperty>::const_iterator it = _properties.begin(); + it != _properties.end(); + ++it ) + { + if ( it->name() == propertyName ) + { + if ( it->type() == type ) + return Found; + else + return TypeMismatch; + } + } + + return NotFound; +} + + +void +YPropertySet::add( const YProperty & prop ) +{ + _properties.push_back( prop ); +} + + +void +YPropertySet::add( const YPropertySet & otherSet ) +{ + for ( YPropertySet::const_iterator it = otherSet.propertiesBegin(); + it != otherSet.propertiesEnd(); + ++it ) + { + add( *it ); + } +} + + +YPropertySet::const_iterator +YPropertySet::propertiesBegin() const +{ + return _properties.begin(); +} + +YPropertySet::const_iterator +YPropertySet::propertiesEnd() const +{ + return _properties.end(); +} + Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h Wed May 30 18:25:05 2007 @@ -21,123 +21,202 @@ #define YProperty_h #include <string> +#include <vector> +#if 0 namespace YUI { +#endif + + enum YPropertyType + { + YUnknownPropertyType = 0, + YOtherProperty, // requires futher checking + YStringProperty, // const std::string & + YBoolProperty, // bool + YIntegerProperty // YCP Integer == C++ long long + + }; + + typedef long long YInteger; + /** - * Base class for all property classes. Necessary to store different - * template instances in the same container class. + * Description class for widget properties **/ - class YPropertyBase + class YProperty { - protected: + public: /** * Constructor: Create a property with the specified name. **/ - YPropertyBase( const std::string & name ) + YProperty( const std::string & name, YPropertyType type ) : _name( name ) + , _type( type ) {} - virtual ~YPropertyBase() {} - - public: /** * Returns the name of this property. **/ std::string name() const { return _name; } + /** + * Returns the type of this property. + **/ + YPropertyType type() const { return _type; } + + /** + * Returns the type of this property as string. + **/ + std::string typeAsStr() const { return YProperty::typeAsStr( _type ); } + + /** + * Returns a string description of a property type. + **/ + static std::string typeAsStr( YPropertyType type ); + private: - std::string _name; + std::string _name; + YPropertyType _type; }; /** - * Template class for properties of different types for classes of type - * Widget_T. + * Transport class for the value of simple properties. + * + * More complex properties (lists of items, tree descriptions, ...) have to + * be handled specifically someplace else, but most properties are of + * simple types and can be treated in similar ways. **/ - template<class Widget_T, class Value_T> class YProperty: - public YPropertyBase + class YPropertyValue { public: /** - * Constructor: Create a property with the specified name. - * The value of this property will be retrieved with the specified - * 'getMethod' and set with the specified 'setMethod'. - * - * Example: - * - * class MyWidget: public YWidget - * { - * private: - * std::string _label; - * - * public: - * ... - * std::string label() const { return _label; } - * void setLabel( std::string newLabel ) { _label = newLabel; } - * }; - * - * YProperty<MyWidget, std::string> labelProp( "Label", - * &(MyWidget::label), - * &(MyWidget::setLabel) ); - * MyWidget w = new MyWidget(...); - * std::string myLabel = labelProp.get( w, "Label" ); - **/ - YProperty( const std::string & name, - Value_T (Widget_T::*getMethod)(), - void (Widget_T::*setMethod)( Value_T ) ) - : YPropertyBase( name ) - , _getMethod( getMethod ) - , _setMethodByValue( setMethod ) - , _setMethodByConstRef( 0 ) - {} + * Constructor for string properties. + **/ + YPropertyValue( const std::string & str ): + _type( YStringProperty ), _stringVal( str ) {} /** - * Constructor with a setMethod that accepts a const ref rather than - * the value directly. + * Constructor for bool properties. **/ - YProperty( const std::string & name, - Value_T (Widget_T::*getMethod)(), - void (Widget_T::*setMethod)( const Value_T & ) ) - : YPropertyBase( name ) - , _getMethod( getMethod ) - , _setMethodByValue( 0 ) - , _setMethodByConstRef( setMethod ) - {} + YPropertyValue( bool b ): + _type( YBoolProperty ), _boolVal( b ) {} /** - * Destructor. + * Constructor for numerical (YCP integer) properties. **/ - virtual ~YProperty() {} + YPropertyValue( YInteger num ): + _type( YIntegerProperty ), _integerVal( num ) {} /** - * Retrieve the current value of this property from 'widget'. + * Returns the type of this property value. + * Use this to determine which xyVal() method to use. **/ - Value_T get( Widget_T * widget ) const - { - return (widget->*_getMethod)(); - } + YPropertyType type() const { return _type; } /** - * Set this property in 'widget'. + * Returns the type of this property value as string. **/ - void set( Widget_T * widget, Value_T newValue ) - { - if ( _setMethodByValue ) - (widget->*_setMethodByValue)( newValue ); - else - (widget->*_setMethodByConstRef)( newValue ); - } + std::string typeAsStr() const { return YProperty::typeAsStr( _type ); } + + /** + * Methods to get the value of this property. + * Check with type() which one to use. + **/ + std::string stringVal() const { return _stringVal; } + bool boolVal() const { return _boolVal; } + YInteger integerVal() const { return _integerVal; } private: - Value_T (Widget_T::*_getMethod)(); - void (Widget_T::*_setMethodByValue)( Value_T ); - void (Widget_T::*_setMethodByConstRef)( const Value_T & ); + + YPropertyType _type; + std::string _stringVal; + bool _boolVal; + YInteger _integerVal; }; + /** + * A set of properties to check names and types against. + **/ + class YPropertySet + { + public: + /** + * Constructor. + **/ + YPropertySet(); + + enum SearchResult + { + NotFound = 0, // = 0 for use like: if ( ! propSet.lookup( "Label" ) ) ... + Found, + TypeMismatch // Found, but wrong type + }; + + /** + * Look up a property with 'propertyName' in this property set. + **/ + SearchResult lookup( const std::string & propertyName ) const; + + /** + * Look up a property with 'propertyName' in this property set. + * If it contains a property with that name, check also the expected + * type against 'type'. + **/ + SearchResult lookup( const std::string & propertyName, YPropertyType type ) const; + + /** + * Same as above, overloaded for convenience. + **/ + SearchResult lookup( const YProperty & prop ) const + { return lookup( prop.name(), prop.type() ); } + + /** + * Returns 'true' if this property set does not contain anything. + **/ + bool isEmpty() const { return _properties.empty(); } + + /** + * Add a property to this property set. + **/ + void add( const YProperty & prop ); + + /** + * Adds all properties of another property set. + * + * If that other set contains duplicates (properties that are already + * in this set), those others will never be found with lookup(). + **/ + void add( const YPropertySet & otherSet ); + + typedef std::vector<YProperty>::const_iterator const_iterator; + + /** + * Returns an iterator that points to the first property in this set. + **/ + const_iterator propertiesBegin() const; + + /** + * Returns an iterator that points after the last property in this set. + **/ + const_iterator propertiesEnd() const; + + private: + + /** + * This class uses a simple std::vector as a container to hold the + * properties: Normally, the number of properties for each widget is so + * small (2..5) that using any more sophisticated container like + * std::set etc. would not pay off. More likely, it would add overhead. + **/ + std::vector<YProperty> _properties; + }; + +#if 0 } // namespace YUI +#endif #endif // YProperty_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc Wed May 30 18:25:05 2007 @@ -35,13 +35,13 @@ struct YRadioButtonPrivate { - YCPString label; + std::string label; YRadioButtonGroup * radioButtonGroup; /** * Constructor **/ - YRadioButtonPrivate( YCPString label ) + YRadioButtonPrivate( std::string label ) : label( label ) , radioButtonGroup( 0 ) {}; @@ -51,7 +51,7 @@ YRadioButton::YRadioButton( const YWidgetOpt & opt, const YCPString & label ) : YWidget( opt ) - , priv( new YRadioButtonPrivate( label ) ) + , priv( new YRadioButtonPrivate( label->value() ) ) { YUI_CHECK_NEW( priv ); } @@ -64,18 +64,64 @@ } -void YRadioButton::setLabel( const YCPString & newLabel ) +void YRadioButton::setLabel( const std::string & newLabel ) { priv->label = newLabel; } -YCPString YRadioButton::label() const +std::string YRadioButton::label() const { return priv->label; } +const YPropertySet & +YRadioButton::propertySet() +{ + static YPropertySet propSet; + + if ( propSet.isEmpty() ) + { + propSet.add( YProperty( YUIProperty_Value, YBoolProperty ) ); + propSet.add( YProperty( YUIProperty_Label, YStringProperty ) ); + propSet.add( YWidget::propertySet() ); + } + + return propSet; +} + + +void +YRadioButton::setProperty( const std::string & propertyName, const YPropertyValue & val ) +{ + YPropertySet::SearchResult result = propertySet().lookup( propertyName, val.type() ); + + if ( result == YPropertySet::Found ) + { + if ( propertyName == YUIProperty_Value ) setValue( val.boolVal() ); + else if ( propertyName == YUIProperty_Label ) setLabel( val.stringVal() ); + else + YWidget::setProperty( propertyName, val ); + } +} + + +YPropertyValue +YRadioButton::getProperty( const std::string & propertyName ) +{ + YPropertySet::SearchResult result = propertySet().lookup( propertyName ); + + if ( result == YPropertySet::Found ) + { + if ( propertyName == YUIProperty_Value ) return YPropertyValue( value() ); + if ( propertyName == YUIProperty_Label ) return YPropertyValue( label() ); + else + return YWidget::getProperty( propertyName ); + } +} + + YCPValue YRadioButton::changeWidget( const YCPSymbol & property, const YCPValue & newvalue ) { string s = property->symbol(); @@ -104,7 +150,7 @@ { if ( newvalue->isString() ) { - setLabel( newvalue->asString() ); + setLabel( newvalue->asString()->value() ); return YCPBoolean( true ); } else @@ -123,7 +169,7 @@ { string s = property->symbol(); if ( s == YUIProperty_Value ) return YCPBoolean( value() ); - else if ( s == YUIProperty_Label ) return label(); + else if ( s == YUIProperty_Label ) return YCPString( label() ); else return YWidget::queryWidget( property ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h Wed May 30 18:25:05 2007 @@ -68,15 +68,43 @@ virtual char *widgetClass() { return "YRadioButton"; } /** + * Set a property. + * Reimplemented from YWidget. + * + * This method may throw exceptions, for example + * - if there is no property with that name + * - if the expected type and the type mismatch + * - if the value is out of range + **/ + virtual void setProperty( const std::string & propertyName, + const YPropertyValue & val ); + + /** + * Get a property. + * Reimplemented from YWidget. + * + * This method may throw exceptions, for example + * - if there is no property with that name + **/ + virtual YPropertyValue getProperty( const std::string & propertyName ); + + /** + * Return this class's property set. + * This also initializes the property upon the first call. + * Reimplemented from YWidget. + **/ + virtual const YPropertySet & propertySet(); + + /** * Returns the user-visible label (the text on the RadioButton). **/ - YCPString label() const; + std::string label() const; /** * Change the label. Overload this, but call * YRadioButton::setLabel at the end of your own function. */ - virtual void setLabel( const YCPString & label ); + virtual void setLabel( const std::string & label ); /** * Implements the ui command changeWidget. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc Wed May 30 18:25:05 2007 @@ -26,6 +26,7 @@ #define y2log_component "ui" #include <ycp/y2log.h> #include "YUIException.h" +#include "YWidget.h" using std::string; @@ -42,7 +43,7 @@ sprintf( formatted_number, "%u", _line ); str += formatted_number; - + return str; } @@ -130,3 +131,41 @@ // INT << where_r << " " << prefix_r << " " << excpt_r << endl; } + +ostream & +YUIUnknownPropertyException::dumpOn( ostream & str ) const +{ + if ( widget() ) + { + return str << widget()->widgetClass() + << " has no property named \"" + << property().name() + << "\"" + << endl; + } + else + { + return str << "Unknown property name \"" + << property().name() + << "\"" + << endl; + } +} + + +ostream & +YUIPropertyTypeMismatchException::dumpOn( ostream & str ) const +{ + const char * widgetClass = widget() ? + widget()->widgetClass() : + "<Unknown Widget Type>"; + + return str << "Property type mismatch: " + << widgetClass + << "::" << property().name() + << "is type " + << property().typeAsStr() + << ", not " + << value().typeAsStr() + << endl; +} Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h Wed May 30 18:25:05 2007 @@ -27,9 +27,13 @@ #include <iosfwd> #include <stdexcept> +#include "YProperty.h" + using std::string; using std::ostream; +class YWidget; + // // Macros for application use @@ -325,22 +329,117 @@ class YUIOutOfMemoryException: public YUIException { public: - /** - * Constructor. - **/ YUIOutOfMemoryException() : YUIException( "Out of memory" ) {} - /** - * Destructor. - **/ virtual ~YUIOutOfMemoryException() throw() {} }; // class YUIOutOfMemoryException +/** + * Abstract base class for widget property exceptions. + **/ +class YUIPropertyException: public YUIException +{ +protected: + YUIPropertyException( const YProperty & prop, + YWidget * widget = 0 ) + : YUIException() + , _property( prop ) + , _widget( widget ) + {} + + virtual ~YUIPropertyException() throw() + {} + +public: + /** + * Returns the property that caused this exception. + **/ + YProperty property() const { return _property; } + + /** + * Returns the associated widget or 0 if there was none. + **/ + YWidget * widget() const { return _widget; } + +protected: + + /** + * Write proper error message with all relevant data. + * Reimplemented from YUIException. + **/ + virtual ostream & dumpOn( ostream & str ) const = 0; + +private: + YProperty _property; + YWidget * _widget; +}; + + +/** + * Exception class for "unknown property name": + * The application tried to set (or query) a property that doesn't exist. + **/ +class YUIUnknownPropertyException: public YUIPropertyException +{ +public: + YUIUnknownPropertyException( const std::string & propertyName, YWidget * widget ) + : YUIPropertyException( YProperty( propertyName, YUnknownPropertyType ), widget ) + {} + + virtual ~YUIUnknownPropertyException() throw() + {} + +protected: + + /** + * Write proper error message with all relevant data. + * Reimplemented from YUIException. + **/ + virtual ostream & dumpOn( ostream & str ) const; +}; + + +/** + * Exception class for "property type mismatch": + * The application tried to set a property with a wrong type. + **/ +class YUIPropertyTypeMismatchException: public YUIPropertyException +{ +public: + + YUIPropertyTypeMismatchException( const YProperty & property, + const YPropertyValue & value, + YWidget * widget ) + : YUIPropertyException( property, widget ) + , _val( value ) + {} + + virtual ~YUIPropertyTypeMismatchException() throw() + {} + + /** + * Return the property value (and type) the application tried to set. + **/ + YPropertyValue value() const { return _val; } + +protected: + + /** + * Write proper error message with all relevant data. + * Reimplemented from YUIException. + **/ + virtual ostream & dumpOn( ostream & str ) const; + +private: + YPropertyValue _val; +}; + + // // Helper templates // Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Wed May 30 18:25:05 2007 @@ -152,6 +152,64 @@ } +const YPropertySet & +YWidget::propertySet() +{ + static YPropertySet propSet; + + if ( propSet.isEmpty() ) + { + propSet.add( YProperty( YUIProperty_Enabled, YBoolProperty ) ); + propSet.add( YProperty( YUIProperty_Notify, YBoolProperty ) ); + propSet.add( YProperty( YUIProperty_WindowID, YIntegerProperty) ); + propSet.add( YProperty( YUIProperty_WidgetClass, YStringProperty ) ); + propSet.add( YProperty( YUIProperty_DebugLabel, YStringProperty ) ); + propSet.add( YProperty( YUIProperty_DialogDebugLabel, YStringProperty ) ); + } + + return propSet; +} + + +void +YWidget::setProperty( const std::string & propertyName, const YPropertyValue & val ) +{ + YPropertySet::SearchResult result = propertySet().lookup( propertyName, val.type() ); + + if ( result == YPropertySet::Found ) + { + if ( propertyName == YUIProperty_Enabled ) setEnabling( val.boolVal() ); + else if ( propertyName == YUIProperty_Notify ) setNotify ( val.boolVal() ); + else + { + if ( propertyName == YUIProperty_WidgetClass || + propertyName == YUIProperty_DebugLabel || + propertyName == YUIProperty_DialogDebugLabel ) + { + y2error( "Property \"%s\" is read-only", propertyName.c_str() ); + } + } + } +} + + +YPropertyValue +YWidget::getProperty( const std::string & propertyName ) +{ + YPropertySet::SearchResult result = propertySet().lookup( propertyName ); + + if ( result == YPropertySet::Found ) + { + if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( getEnabling() ); + if ( propertyName == YUIProperty_Notify ) return YPropertyValue( getNotify() ); + if ( propertyName == YUIProperty_WidgetClass ) return YPropertyValue( widgetClass() ); + if ( propertyName == YUIProperty_DebugLabel ) return YPropertyValue( debugLabel() ); + if ( propertyName == YUIProperty_DialogDebugLabel ) return YPropertyValue( yDialog()->debugLabel() ); + } +} + + + YCPValue YWidget::changeWidget( const YCPSymbol & property, const YCPValue & newvalue ) { string symbol = property->symbol(); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Wed May 30 18:25:05 2007 @@ -23,6 +23,7 @@ #include <string> #include <list> #include <ycp/YCPValue.h> +#include "YProperty.h" #include "YWidgetOpt.h" #include "YUISymbols.h" @@ -41,7 +42,6 @@ typedef std::list<YWidget *>::iterator YWidgetListIterator; typedef std::list<YWidget *>::const_iterator YWidgetListConstIterator; - /** * @short Abstract base class of all ui widgets */ @@ -78,11 +78,66 @@ virtual std::string debugLabel(); /** + * Return this class's property set. + * This also initializes the property upon the first call. + * + * Derived classes should reimplement this. + * + * Remember to add the base class's property set to your own + * in reimplemented versions, e.g.: + * + * const YPropertySet & + * myWidgetClass::propertySet() + * { + * static YPropertySet propSet; + * + * if ( propSet.isEmpty() ) + * { + * // Add properties for the derived class + * propSet.add( YProperty( YUIProperty_Value, YStringProperty ) ); + * propSet.add( YProperty( YUIProperty_Label, YStringProperty ) ); + * + * // Add base class properties + * propSet.add( YWidget::propertySet() ); + * } + * + * return propSet; + * } + * + * Otherwise the base class's properties will not be available in the + * derived class. It is also important that the base class's properties + * are added after those of the derived class so the derived class's + * properties have priority over those of the base class. + **/ + virtual const YPropertySet & propertySet(); + + /** + * Set a property. Derived classes need to implement this. + * + * This method may throw exceptions, for example + * - if there is no property with that name + * - if the expected type and the type mismatch + * - if the value is out of range + **/ + virtual void setProperty( const std::string & propertyName, + const YPropertyValue & val ); + // FIXME: = 0 + + /** + * Get a property. Derived classes need to implement this. + * + * This method may throw exceptions, for example + * - if there is no property with that name + **/ + virtual YPropertyValue getProperty( const std::string & propertyName ); + // FIXME: = 0 + + /** * Checks whether or not this object is valid. This is to enable * dangling pointer error checking ( i.e. this object is already * deallocated, but a pointer to it is still in use ). */ - bool isValid() const { return magic == YWIDGET_MAGIC; } + bool isValid() const { return magic == YWIDGET_MAGIC; } /** * Return the widget serial number (the internal widget ID). @@ -451,6 +506,10 @@ long windowID; +private: + static YPropertySet _propertySet; + + public: /** * Helper class that calls startMultipleChanges() in its constructor @@ -461,7 +520,7 @@ { public: OptimizeChanges( YWidget & w ) : yw(w) { yw.startMultipleChanges(); } - ~OptimizeChanges() { yw.doneMultipleChanges(); } + ~OptimizeChanges() { yw.doneMultipleChanges(); } private: OptimizeChanges( const OptimizeChanges & ); // no copy void operator=( const OptimizeChanges & ); // no assign Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h Wed May 30 18:25:05 2007 @@ -26,30 +26,7 @@ { typedef double YLayoutSize_t; -#if 0 - struct YItem - { - std::string label; - std::string id; - bool isSelected; - - YItem( std::string labelText ) - : label( labelText ) - , id( labelText ) - , isSelected( false ) - {} - - YItem( std::string labelText, std::string idText, bool sel = false ) - : label( labelText ) - , id( idText ) - , isSelected( sel ) - {} - }; // struct YItem - - typedef std::list<YItem> YItemList; -#endif - - + class YWidgetFactory { public: @@ -78,7 +55,7 @@ YInputField * createInputField ( YWidget * parent, std::string label ); YCheckBox * createCheckBox ( YWidget * parent, std::string label, bool isChecked = false ); YRadioButton * createRadioButton ( YWidget * parent, std::string label, bool isChecked = false ); - YComboBox * createComboBox ( YWidget * parent, std::string label, bool editable = false ); + YComboBox * createComboBox ( YWidget * parent, std::string label, bool editable = false ); YSelectionBox * createSelectionBox ( YWidget * parent, std::string label ); YTree * createTree ( YWidget * parent, std::string label ); YTable * createTable ( YWidget * parent ); @@ -203,6 +180,30 @@ }; // class YWidgetFactory +#if 0 + struct YItem + { + std::string label; + std::string id; + bool isSelected; + + YItem( std::string labelText ) + : label( labelText ) + , id( labelText ) + , isSelected( false ) + {} + + YItem( std::string labelText, std::string idText, bool sel = false ) + : label( labelText ) + , id( idText ) + , isSelected( sel ) + {} + }; // struct YItem + + typedef std::list<YItem> YItemList; +#endif + + } // namespace YUI -- 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] r38209 - in /trunk/ftp-server: config/ftp-server.rnc src/FtpServer.ycp src/helps.ycp src/uiforms.ycp src/wid_functions.ycp src/write_load.ycp
by juhliarik＠svn.opensuse.org 30 May '07

30 May '07

Author: juhliarik Date: Wed May 30 17:24:48 2007 New Revision: 38209 URL: http://svn.opensuse.org/viewcvs/yast?rev=38209&view=rev Log: add patch for uploading anonymous user in vsftpd (create upload dir) Modified: trunk/ftp-server/config/ftp-server.rnc trunk/ftp-server/src/FtpServer.ycp trunk/ftp-server/src/helps.ycp trunk/ftp-server/src/uiforms.ycp trunk/ftp-server/src/wid_functions.ycp trunk/ftp-server/src/write_load.ycp Modified: trunk/ftp-server/config/ftp-server.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/config/ftp-server.rnc… ============================================================================== --- trunk/ftp-server/config/ftp-server.rnc (original) +++ trunk/ftp-server/config/ftp-server.rnc Wed May 30 17:24:48 2007 @@ -23,7 +23,6 @@ element AnonCreatDirs { text }? & element Banner { text }? & element SSLEnable { text }? & - element SSLVersion { text }? & element TLS { text }? & element AntiWarez { text }? & element SSL { text }? & Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev… ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Wed May 30 17:24:48 2007 @@ -96,6 +96,24 @@ global boolean start_xinetd = false; /** + * variable signifies if it is create upload dir + * only for vsftpd and anonymous connections with allowed upload + * + * global boolean variable + */ + +global boolean create_upload_dir = false; + +/** + * variable signifies if upload dir has good permissions + * only for vsftpd and anonymous connections with allowed upload + * + * global boolean variable + */ + +global boolean upload_good_permission = false; + +/** * variable signifies home dir for anonymous user * * global string variable @@ -252,6 +270,48 @@ return true; } + +/** + * Read vsftpd configuration + * existing upload file and permissions + * + * @return boolean successfull + */ + + +boolean ReadVSFTPDUpload () { + boolean result = false; + string command = ""; + if (anon_homedir !="") + command = "ls -l "+anon_homedir+ " | grep upload"; + if (command != "") { + map options = (map)SCR::Execute (.target.bash_output, command); + y2milestone("[ftp-server] (ReadVSFTPDUpload) command for existing upload dir: %1 output: %2",command, options); + if (options["exit"]:nil == 0) + result = true; + else + result = false; + if (result) { + //Popup::Message("Work ReadVSFTPDUpload"); + create_upload_dir = true; + string permissions = substring (tostring(options["stdout"]:nil),0,10); + string w = filterchars (permissions, "w"); + string r = filterchars (permissions, "r"); + if ((size(w) <3) || (size(r) <3)) { + upload_good_permission = false; + //Popup::Message("good permissions"); + } else { + upload_good_permission = true; + //Popup::Message("wrong permissions"); + } + } + } + return result; +} + + + + /** * Remap current pure -FtpServer configuration * to temporary structure @@ -295,7 +355,7 @@ if ((Users::Read () == "") && (EDIT_SETTINGS["VirtualUser"]:nil == "NO")) { if ((vsftpd_edit) && (EDIT_SETTINGS["GuestUser"]:nil != "") && (EDIT_SETTINGS["FtpDirLocal"]:nil == "")) { - Popup::Message("if ((vsftpd_edit) && (EDIT_SETTINGS"); + //Popup::Message("if ((vsftpd_edit) && (EDIT_SETTINGS"); Users::SelectUserByName (EDIT_SETTINGS["GuestUser"]:nil); userinfo = Users::GetCurrentUser (); string guest_home_dir = (string) userinfo["homedirectory"]:nil; @@ -319,9 +379,10 @@ boolean progress_orig = Progress::set (false); SuSEFirewall::Read (); Progress::set (progress_orig); - - - + //read existing upload directory for vsftpd + if (vsftpd_edit) { + result = ReadVSFTPDUpload (); + } return result; } @@ -505,7 +566,49 @@ return result; } +/** + * Ask for creation upload directory + * It is necessary if user want to allow uploading for anonymous + * @return boolean result of function (true/false) + */ +boolean WriteUpload () { + boolean result = true; + string command =""; + integer authentication = tointeger(EDIT_SETTINGS["AnonAuthen"]:nil); + if ((vsftpd_edit) && (authentication == 0) && (create_upload_dir) && (upload_good_permission)) { + boolean write_enable = ((EDIT_SETTINGS["EnableUpload"]:nil == "YES") ? true:false); + boolean anon_upload = ((EDIT_SETTINGS["AnonReadOnly"]:nil == "NO") ? true:false); + boolean anon_create_dirs = ((EDIT_SETTINGS["AnonCreatDirs"]:nil == "YES") ? true:false); + if ((write_enable) && ((anon_upload) || (anon_create_dirs))) + command = "dir=`ls "; + command = command + anon_homedir; + command = command + " | grep upload`; if [ -z $dir ]; then mkdir "; + command = command + anon_homedir +"upload; chown "; + + if (EDIT_SETTINGS["GuestUser"]:nil !="") + command = command + EDIT_SETTINGS["GuestUser"]:nil +":"+EDIT_SETTINGS["GuestUser"]:nil; + else if (EDIT_SETTINGS["FTPUser"]:nil !="") + command = command + EDIT_SETTINGS["FTPUser"]:nil +":"+EDIT_SETTINGS["FTPUser"]:nil; + command = command + " " + anon_homedir +"upload; chmod 766 "; + command = command + anon_homedir +"upload; else chmod 766 " + anon_homedir +"upload; fi"; +/* +"dir=`ls /srv/ftp/ | grep upload`; if [ -z $dir ]; then echo $dir; mkdir /srv/ftp/upload; + chown ftp:ftp /srv/ftp/upload/; chmod 755 /srv/ftp/upload; else chmod 766 /srv/ftp/upload/; fi" +*/ + y2milestone("[ftp-server] (WriteUpload) bash command for creating upload dir : %1", command); + map options = (map)SCR::Execute (.target.bash_output, command); + if (options["exit"]:nil == 0) + result = true; + else + result = false; + //Popup::Message(command); + + } else { + result = true; + } + return result; +} /** * read value from PURE_EDIT_SETTINGS * @@ -667,7 +770,7 @@ /* FtpServer read dialog caption */ string caption = _("Saving FTP Configuration"); - integer steps = 2; + integer steps = 3; // We do not set help text here, because it was set outside Progress::New(caption, " ", @@ -697,6 +800,13 @@ if (!WriteXinetd ()) Report::Error (_("Cannot write settings for xinetd!")); sleep(sl); + if (PollAbort()) return false; + Progress::NextStage (); + // write settings for starting daemon + if (!WriteUpload ()) Report::Error (_("Cannot create upload direcotry for anonymous connections!")); + sleep(sl); + + if(PollAbort()) return false; /* Progress finished */ Progress::NextStage(); @@ -858,7 +968,6 @@ * @return table items */ global list Overview() { - // TODO FIXME: your code here... return []; } Modified: trunk/ftp-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/helps.ycp?rev=382… ============================================================================== --- trunk/ftp-server/src/helps.ycp (original) +++ trunk/ftp-server/src/helps.ycp Wed May 30 17:24:48 2007 @@ -146,14 +146,26 @@ /* anonymous settings anonymous can't upload dialog help 5/6 */ _("Anonymous Can Upload -If enabled anonymous users will be permitted to upload. +If enabled anonymous users will be permitted to upload. +vsftpd only: If you want that anonymous users can upload you +need existing directory with allowed writing in home directory after login. ")+ /* anonymous settings anonymous can create dirs dialog help 6/6 */ _("Anonymous Can Create Dirs -If enabled anonymous users can create directories. +If enabled anonymous users can create directories. +vsftpd only: If you want that anonymous users can create directories you +need existing directory with allowed writing in home directory after login. +")+ + +/* anonymous settings anonymous can create dirs dialog help 6/6 */ +_("Enable Upload (vsftpd only) +If enable ftp users can upload. Anonymous users need to allow + \"Anonymous Can Upload\" for enabling upload. "), + + /* expert settings dialog help 1/6 */ "vsftpd_settings" : _("<big>Expert Settings Expert settings - security and firewall settings. Modified: trunk/ftp-server/src/uiforms.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/uiforms.ycp?rev=3… ============================================================================== --- trunk/ftp-server/src/uiforms.ycp (original) +++ trunk/ftp-server/src/uiforms.ycp Wed May 30 17:24:48 2007 @@ -116,8 +116,8 @@ `HBox(`HSpacing(1),`VBox ( `Left(`CheckBox (`id("EnableUpload"), `opt(`notify), _("&Enable Upload"))), `HBox(`HSpacing(2),`VBox( - `Left(`CheckBox (`id("AnonReadOnly"), _("Anon&ymous Can Upload"))), - `Left(`CheckBox (`id("AnonCreatDirs"), _("Anonymou&s Can Create Directories"))) + `Left(`CheckBox (`id("AnonReadOnly"), `opt(`notify), _("Anon&ymous Can Upload"))), + `Left(`CheckBox (`id("AnonCreatDirs"),`opt(`notify), _("Anonymou&s Can Create Directories"))) )) )) ), //end of `Frame ( _("Anonymous Settings") Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp… ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Wed May 30 17:24:48 2007 @@ -25,6 +25,15 @@ include "ftp-server/uiforms.ycp"; + +/** + * variable signifies repeat asking about upload file + * only for vsftpd + * + * internal boolean variable + */ +boolean ask_again = true; + /** * CWMServiceStart function with no parameter returning boolean value * that says if the service is started. @@ -342,6 +351,7 @@ FtpServer::WriteToEditMap("AnonReadOnly", (((boolean) UI::QueryWidget(`id("AnonReadOnly"), `Value) == true) ? "NO":"YES")); if (FtpServer::vsftpd_edit) FtpServer::WriteToEditMap("EnableUpload", (((boolean) UI::QueryWidget(`id("EnableUpload"), `Value) == true) ? "YES":"NO")); + } /** @@ -352,8 +362,12 @@ symbol HandleAnonSettings(string key, map event) { if (FtpServer::vsftpd_edit) { any button = event["ID"]:nil; - if (button == "EnableUpload") { - boolean check_upload = (boolean) UI::QueryWidget(`id("EnableUpload"), `Value); + boolean anon_upload = false; + boolean anon_create_dirs = false; + string yesno_comment =""; + string yesno_question =""; + boolean check_upload = (boolean) UI::QueryWidget(`id("EnableUpload"), `Value); + if (button == "EnableUpload") { if (check_upload) { UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, true); UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, true); @@ -362,6 +376,44 @@ UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, false); } } // end of if (button == "EnableUpload") { + + anon_upload = (boolean) UI::QueryWidget(`id("AnonReadOnly"), `Value); + anon_create_dirs = (boolean) UI::QueryWidget(`id("AnonCreatDirs"), `Value); + + if (((button == "AnonReadOnly") || (anon_upload) && (check_upload)) && (ask_again)) { + if (!FtpServer::create_upload_dir) { + yesno_question ="Do you want to create directory\n" + FtpServer::anon_homedir +"upload with allowed writing?"; + yesno_comment = "If you want that \"anonymous\" users can upload\n you need to create directory with allowed writing.\n\n"; + yesno_comment = yesno_comment + FtpServer::anon_homedir + " is a home directory after login of \"anonymous\" users."; + FtpServer::create_upload_dir = Popup::YesNoHeadline(yesno_question, yesno_comment); + ask_again = FtpServer::create_upload_dir; + FtpServer::upload_good_permission = true; + } else if (!FtpServer::upload_good_permission) { + yesno_question ="Do you want to change permission\nfor" + FtpServer::anon_homedir +"upload (allow writing)?"; + yesno_comment = "If you want that \"anonymous\" users can upload\n you need directory with allowed writing.\n\n"; + yesno_comment = yesno_comment + FtpServer::anon_homedir + " is a home directory after login of \"anonymous\" users."; + FtpServer::upload_good_permission = Popup::YesNoHeadline(yesno_question, yesno_comment); + ask_again = FtpServer::upload_good_permission; + } + + } + + if (((button == "AnonCreatDirs") || (anon_create_dirs) && (check_upload)) && (ask_again)) { + if (!FtpServer::create_upload_dir) { + yesno_question ="Do you want to create directory\n" + FtpServer::anon_homedir +"upload with allowed writing?"; + yesno_comment = "If you want that \"anonymous\" users can create directories\n you need to create directory with allowed writing.\n\n"; + yesno_comment = yesno_comment + FtpServer::anon_homedir + " is a home directory after login of \"anonymous\" users."; + FtpServer::create_upload_dir = Popup::YesNoHeadline(yesno_question, yesno_comment); + ask_again = FtpServer::create_upload_dir; + FtpServer::upload_good_permission = true; + } else if (!FtpServer::upload_good_permission) { + yesno_question ="Do you want to change permission\nfor" + FtpServer::anon_homedir +"upload (allow writing)?"; + yesno_comment = "If you want that \"anonymous\" users can create directories\n you need directory with allowed writing.\n\n"; + yesno_comment = yesno_comment + FtpServer::anon_homedir + " is a home directory after login of \"anonymous\" users."; + FtpServer::upload_good_permission = Popup::YesNoHeadline(yesno_question, yesno_comment); + ask_again = FtpServer::upload_good_permission; + } + } } // end of if (FtpServer::vsftpd_edit) { } Modified: trunk/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/write_load.ycp?re… ============================================================================== --- trunk/ftp-server/src/write_load.ycp (original) +++ trunk/ftp-server/src/write_load.ycp Wed May 30 17:24:48 2007 @@ -705,10 +705,8 @@ yes_no = FtpServer::EDIT_SETTINGS["AnonReadOnly"]:nil; if (yes_no == "YES") { FtpServer::VS_SETTINGS["anon_upload_enable"] = "NO"; - FtpServer::VS_SETTINGS["write_enable"] = "NO"; } else { FtpServer::VS_SETTINGS["anon_upload_enable"] = "YES"; - FtpServer::VS_SETTINGS["write_enable"] = "YES"; } } else { if (haskey(FtpServer::VS_SETTINGS, "anon_upload_enable")) { @@ -731,15 +729,11 @@ case("AnonCreatDirs"): if (vsftpd_edit) { if (write) { - FtpServer::VS_SETTINGS["anon_mkdir_write_enable"] = FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil; - if (FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil == "YES") - FtpServer::VS_SETTINGS["write_enable"] = "YES"; + FtpServer::VS_SETTINGS["anon_mkdir_write_enable"] = FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil; } else { return ((haskey(FtpServer::VS_SETTINGS, "anon_mkdir_write_enable") ? toupper(FtpServer::VS_SETTINGS["anon_mkdir_write_enable"]:nil) : FtpServer::DEFAULT_CONFIG["AnonCreatDirs"]:nil)); } - - } else { if (write) FtpServer::PURE_SETTINGS["AnonymousCanCreateDirs"] = FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil; -- 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] r38208 - in /trunk/yast2/library/network/src: refresh-srv-def-by-pkgs-trans.sh yast2-services-translations.ycp
by locilka＠svn.opensuse.org 30 May '07

30 May '07

Author: locilka Date: Wed May 30 15:24:17 2007 New Revision: 38208 URL: http://svn.opensuse.org/viewcvs/yast?rev=38208&view=rev Log: Script for getting strings for translations from firewall sysconfig service files has been adjusted to recognize wrong entries (those default ones left from template service). Modified: trunk/yast2/library/network/src/refresh-srv-def-by-pkgs-trans.sh trunk/yast2/library/network/src/yast2-services-translations.ycp Modified: trunk/yast2/library/network/src/refresh-srv-def-by-pkgs-trans.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/refres… ============================================================================== --- trunk/yast2/library/network/src/refresh-srv-def-by-pkgs-trans.sh (original) +++ trunk/yast2/library/network/src/refresh-srv-def-by-pkgs-trans.sh Wed May 30 15:24:17 2007 @@ -103,7 +103,9 @@ # ... ## Name: TAG_NAME=`grep -i ".*##[\t ]*Name:[\t ]*" $FILENAME | sed 's/^.*##[\t ]*[Nn][Aa][Mm][Ee]:[\t ]//' | sed 's/"/\\"/'` if [ "$TAG_NAME" == "" ]; then - echo "Something is wrong with file "$FILENAME", no 'Name:' tag found!" + echo "Something is wrong with file '"$FILENAME"', no 'Name:' tag found!" + elif [ "$TAG_NAME" == "template service" ]; then + echo "'Name:' not adjusted correctly in the '"$FILENAME"' file!" else echo " // TRANSLATORS: Name of Service (rpm: "$FILENAME"), can be used as check box, item in multiple selection box..." >> $Y2_NEWYCPFILE echo " tmpstring = _(\""$TAG_NAME"\");" >> $Y2_NEWYCPFILE @@ -113,7 +115,9 @@ # ... ## Description: TAG_DESCRIPTION=`grep -i ".*##[\t ]*Description:[\t ]*" $FILENAME | sed 's/^.*##[\t ]*[Dd][Ee][Ss][Cc][Rr][Ii][Pp][Tt][Ii][Oo][Nn]:[\t ]//' | sed 's/"/\\"/'` if [ "$TAG_DESCRIPTION" == "" ]; then - echo "Something is wrong with file "$FILENAME", no 'Description:' tag found!" + echo "Something is wrong with file '"$FILENAME"', no 'Description:' tag found!" + elif [ "$TAG_DESCRIPTION" == "opens ports for foo in order to allow bar" ]; then + echo "'Description:' not adjusted correctly in the '"$FILENAME"' file!" else echo " // TRANSLATORS: Description of a Service (rpm: "$FILENAME"), used as a common label or an item in table" >> $Y2_NEWYCPFILE echo " tmpstring = _(\""$TAG_DESCRIPTION"\");" >> $Y2_NEWYCPFILE Modified: trunk/yast2/library/network/src/yast2-services-translations.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/yast2-… ============================================================================== --- trunk/yast2/library/network/src/yast2-services-translations.ycp (original) +++ trunk/yast2/library/network/src/yast2-services-translations.ycp Wed May 30 15:24:17 2007 @@ -61,18 +61,6 @@ // TRANSLATORS: Description of a Service (rpm: dnsmasq-dns), used as a common label or an item in table tmpstring = _("Open ports for the dnsmasq DNS/DHCP server"); - // TRANSLATORS: Name of Service (rpm: iceccd), can be used as check box, item in multiple selection box... - tmpstring = _("template service"); - - // TRANSLATORS: Description of a Service (rpm: iceccd), used as a common label or an item in table - tmpstring = _("opens ports for foo in order to allow bar"); - - // TRANSLATORS: Name of Service (rpm: icecream-scheduler), can be used as check box, item in multiple selection box... - tmpstring = _("template service"); - - // TRANSLATORS: Description of a Service (rpm: icecream-scheduler), used as a common label or an item in table - tmpstring = _("opens ports for foo in order to allow bar"); - // TRANSLATORS: Name of Service (rpm: iscsitarget), can be used as check box, item in multiple selection box... tmpstring = _("iSCSI Target Daemon"); -- 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] r38207 - in /trunk/ncurses/src: NCPackageSelectorPlugin.cc NCPackageSelectorPlugin.h
by gs＠svn.opensuse.org 30 May '07

30 May '07

Author: gs Date: Wed May 30 14:58:15 2007 New Revision: 38207 URL: http://svn.opensuse.org/viewcvs/yast?rev=38207&view=rev Log: add NCPackageSelectorPlugin Added: trunk/ncurses/src/NCPackageSelectorPlugin.cc trunk/ncurses/src/NCPackageSelectorPlugin.h Added: trunk/ncurses/src/NCPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPackageSelectorPlu… ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPlugin.cc (added) +++ trunk/ncurses/src/NCPackageSelectorPlugin.cc Wed May 30 14:58:15 2007 @@ -0,0 +1,187 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: NCPackageSelectorPlugin.cc + + Author: Gabriele Mohr <gs(a)suse.de> + + +/-*/ + +#include "NCPackageSelectorPlugin.h" + +#include <ycp/y2log.h> +#include "NCPackageSelectorStart.h" +#include "NCPkgTable.h" + +#define y2log_component "ncurses-ui" + +#define PLUGIN_BASE_NAME "ncurses_pkg" + + +NCPackageSelectorPlugin::NCPackageSelectorPlugin() + : YPackageSelectorPlugin( PLUGIN_BASE_NAME ) +{ + if ( success() ) + { + y2milestone( "Loaded %s plugin successfully from %s", + PLUGIN_BASE_NAME, pluginLibFullPath().c_str() ); + } +} + + +NCPackageSelectorPlugin::~NCPackageSelectorPlugin() +{ + // NOP +} + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPackageSelectorPlugin::createPackageSelector +// METHOD TYPE : YWidget +// +// DESCRIPTION : Create NCPackageSelectorStart which reads the layout +// term of the package selection dialog, creates the widget +// tree and creates the NCPackageSelector. +// +YWidget * NCPackageSelectorPlugin::createPackageSelector( YWidget * parent, + YWidgetOpt & opt ) +{ + YWidget * w = 0; + try + { + w = new NCPackageSelectorStart ( dynamic_cast<NCWidget *>(parent), opt, + YD_HORIZ ); + } + catch (const std::exception & e) + { + UIERR << "Caught a std::exception: " << e.what () << endl; + } + catch (...) + { + UIERR << "Caught an unspecified exception" << endl; + } + return w; +} + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPackageSelectorPluign::createPkgSpecial +// METHOD TYPE : YWidget +// +// DESCRIPTION : creates special widgets used for the package selection +// dialog (which do not have a corresponding widget in qt-ui) +// +YWidget * NCPackageSelectorPlugin::createPkgSpecial( YWidget *parent, + YWidgetOpt &opt, + const YCPString &subwidget ) +{ + YCPString pkgTable( "pkgTable" ); + + YWidget * w = 0; + if ( subwidget->compare( pkgTable ) == YO_EQUAL ) + { + NCDBG << "Creating a NCPkgTable" << endl; + try + { + w = new NCPkgTable( dynamic_cast<NCWidget *>( parent ), opt ); + } + catch (const std::exception & e) + { + UIERR << "Caught a std::exception: " << e.what () << endl; + } + catch (...) + { + UIERR << "Caught an unspecified exception" << endl; + } + } + else + { + NCERR << "PkgSpecial( " << subwidget->toString() << " ) not found - take default `Label" << endl; + w = new NCLabel( dynamic_cast<NCWidget *>( parent ), opt, subwidget ); + } + + return w; +} + +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPackageSelectorPLugin::runPkgSelection +// METHOD TYPE : void +// +// DESCRIPTION : Implementation of UI builtin RunPkgSelection() which +// has to be called after OpenDialog( `PackageSelector() ). +// +YCPValue NCPackageSelectorPlugin::runPkgSelection( YDialog * dialog, + YWidget * selector ) +{ + NCPackageSelectorStart * ncSelector = 0; + + if ( !dialog ) + { + UIERR << "ERROR package selection: No dialog existing." << endl; + return YCPVoid(); + } + if ( !selector ) + { + UIERR << "ERROR package selection: No package selector existing." << endl; + return YCPVoid(); + } + + ncSelector = dynamic_cast<NCPackageSelectorStart *>( selector ); + + bool result = true; + + // start event loop + NCursesEvent event = NCursesEvent::cancel; + + if ( ncSelector ) + { + try + { + ncSelector->showDefaultList(); + NCDialog * ncd = static_cast<NCDialog *>( dialog ); + + do + { + event = ncd->userInput(); + result = ncSelector->handleEvent( event ); + NCDBG << "Result: " << (result?"true":"false") << endl; + } + while ( event != NCursesEvent::cancel && result == true ); + } + catch (const std::exception & e) + { + UIERR << "Caught a std::exception: " << e.what () << endl; + } + catch (...) + { + UIERR << "Caught an unspecified exception" << endl; + } + } + else + { + UIERR << "No NCPackageSelectorStart existing" << endl; + } + + if ( !event.result.isNull() ) + { + UIMIL << "Return value: " << event.result->toString() << endl; + return event.result; + } + else + return YCPVoid(); +} + Added: trunk/ncurses/src/NCPackageSelectorPlugin.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPackageSelectorPlu… ============================================================================== --- trunk/ncurses/src/NCPackageSelectorPlugin.h (added) +++ trunk/ncurses/src/NCPackageSelectorPlugin.h Wed May 30 14:58:15 2007 @@ -0,0 +1,74 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (c) SuSE Linux AG | +\----------------------------------------------------------------------/ + + File: NCPackageSelectorPlugin.h + + Author: Gabriele Mohr <gs(a)suse.de> + +/-*/ + +// -*- c++ -*- + +#ifndef NCPackageSelectorPlugin_h +#define NCPackageSelectorPlugin_h + +#include <YPackageSelectorPlugin.h> +#include <YDialog.h> + +#include <ycp/YCPString.h> + + +/** + * Simplified access to the ncurses UI's package selector plugin. + **/ +class NCPackageSelectorPlugin: public YPackageSelectorPlugin +{ +public: + + /** + * Constructor: Load the plugin library for the Qt package selector. + **/ + NCPackageSelectorPlugin(); + + /** + * Destructor. Calls dlclose() which will unload the plugin library if it + * is no longer used, i.e. if the reference count dlopen() uses reaches 0. + **/ + virtual ~NCPackageSelectorPlugin(); + + /** + * Create a package selector. + * Implemented from YPackageSelectorPlugin. + * + * This might return 0 if the plugin lib could not be loaded or if the + * appropriate symbol could not be located in the plugin lib. + **/ + virtual YWidget * createPackageSelector( YWidget * parent, + YWidgetOpt & opt ); + + /** + * Fills the PackageSelector widget (runs the package selection). + */ + virtual YCPValue runPkgSelection( YDialog *currentDialog, + YWidget * packageSelector ); + + /** + * Create a special widget + */ + virtual YWidget * createPkgSpecial( YWidget *parent, + YWidgetOpt &opt, + const YCPString &subwidget ); +}; + + + +#endif // NCPackageSelectorPlugin_h -- 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] r38206 - in /trunk/ncurses/src: ./ pkg/
by gs＠svn.opensuse.org 30 May '07

30 May '07

Author: gs Date: Wed May 30 14:57:31 2007 New Revision: 38206 URL: http://svn.opensuse.org/viewcvs/yast?rev=38206&view=rev Log: move NCPkgTable and NCPackageSelectorStart to src directory, adapt Makefiles, use NCPackageSelectorPlugin Added: trunk/ncurses/src/NCPackageSelectorStart.cc - copied unchanged from r38203, trunk/ncurses/src/pkg/NCPackageSelectorStart.cc trunk/ncurses/src/NCPackageSelectorStart.h - copied unchanged from r38203, trunk/ncurses/src/pkg/NCPackageSelectorStart.h trunk/ncurses/src/NCPkgTable.cc - copied unchanged from r38201, trunk/ncurses/src/pkg/NCPkgTable.cc trunk/ncurses/src/NCPkgTable.h - copied unchanged from r38201, trunk/ncurses/src/pkg/NCPkgTable.h Removed: trunk/ncurses/src/pkg/NCPackageSelectorStart.cc trunk/ncurses/src/pkg/NCPackageSelectorStart.h trunk/ncurses/src/pkg/NCPkgTable.cc trunk/ncurses/src/pkg/NCPkgTable.h Modified: trunk/ncurses/src/Makefile.am trunk/ncurses/src/YNCursesUI.cc trunk/ncurses/src/YNCursesUI.h trunk/ncurses/src/pkg/Makefile.am Modified: trunk/ncurses/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/Makefile.am?rev=3820… ============================================================================== --- trunk/ncurses/src/Makefile.am (original) +++ trunk/ncurses/src/Makefile.am Wed May 30 14:57:31 2007 @@ -16,84 +16,154 @@ libpy2ncurses_la_LIBADD = \ -L$(libdir) \ - -Lpkg -lpy2ncurses_pkg \ -lyui \ -lncursesw -lpanelw + +#libpy2ncurses_la_LIBADD = \ +# -L$(libdir) \ +# -Lpkg -lpy2ncurses_pkg \ +# -lyui \ +# -lncursesw -lpanelw #liby2ncurses_la_LIBADD = $(libpy2ncurses_la_LIBADD) -libpy2ncurses_la_SOURCES = \ - stdutil.h \ - NCi18n.h \ - Y2Log.h Y2Log.cc \ - tnode.h position.h position.cc \ - YNCursesUI.cc YNCursesUI.h \ - NCtext.h NCtext.cc \ - NCstring.h NCstring.cc \ - stringutil.h stringutil.cc \ - lang2encoding.tab lang2encoding.cc \ - ncursesw.h ncursesw.cc \ - ncursesp.h ncursesp.cc \ - NCtypes.h NCtypes.cc \ - NCurses.h NCurses.cc \ - NCstyle.h NCstyle.cc \ - NCStyleDef.h NCStyleDef.cc \ - NCTableItem.h NCTableItem.cc \ - NCPad.h NCPad.cc \ - NCTreePad.h NCTreePad.cc \ - NCTablePad.h NCTablePad.cc \ - NCTextPad.h NCTextPad.cc \ - NCWidget.h NCWidget.cc \ - NCDialog.h NCDialog.cc \ - NCEmpty.h NCEmpty.cc \ - NCSpacing.h NCSpacing.cc \ - NCSquash.h NCSquash.cc \ - NCAlignment.h NCAlignment.cc \ - NCFrame.h NCFrame.cc \ - NCCheckBoxFrame.h NCCheckBoxFrame.cc \ - NCSplit.h NCSplit.cc \ - NCReplacePoint.h NCReplacePoint.cc \ - NCRadioButtonGroup.h NCRadioButtonGroup.cc \ - \ - NCImage.h NCImage.cc \ - NCCheckBox.h NCCheckBox.cc \ - NCLabel.h NCLabel.cc \ - NCProgressBar.h NCProgressBar.cc \ - NCMenuButton.h NCMenuButton.cc \ - NCPushButton.h NCPushButton.cc \ - NCRadioButton.h NCRadioButton.cc \ - NCTextEntry.h NCTextEntry.cc \ - NCIntField.h NCIntField.cc \ - NCComboBox.h NCComboBox.cc \ - NCPadWidget.h NCPadWidget.cc \ - NCRichText.h NCRichText.cc \ - NCSelectionBox.h NCSelectionBox.cc \ - NCMultiSelectionBox.h NCMultiSelectionBox.cc \ - NCTable.h NCTable.cc \ - NCTree.h NCTree.cc \ - NCLogView.h NCLogView.cc \ - NCMultiLineEdit.h NCMultiLineEdit.cc \ - NCFileSelection.h NCFileSelection.cc \ - NCAskForDirectory.h NCAskForDirectory.cc \ - NCAskForFile.h NCAskForFile.cc \ - \ - NCPopup.h NCPopup.cc \ - NCPopupTable.h NCPopupTable.cc \ - NCPopupList.h NCPopupList.cc \ - NCPopupMenu.h NCPopupMenu.cc \ - NCPopupTextEntry.h NCPopupTextEntry.cc \ - NCPopupInfo.h NCPopupInfo.cc \ - \ - NCstyle.braille.h NCstyle.mono.h \ - NCstyle.linux.h NCstyle.xterm.h \ - \ - Y2CCNCursesUI.cc Y2CCNCursesUI.h \ +noinst_HEADERS = \ + stdutil.h \ + NCi18n.h \ + Y2Log.h \ + tnode.h \ + position.h \ + YNCursesUI.h \ + NCPackageSelectorPlugin.h \ + NCPackageSelectorStart.h \ + NCPkgTable.h \ + NCtext.h \ + NCstring.h \ + stringutil.h \ + ncursesw.h \ + ncursesp.h \ + NCtypes.h \ + NCurses.h \ + NCstyle.h \ + NCStyleDef.h \ + NCTableItem.h \ + NCPad.h \ + NCTreePad.h \ + NCTablePad.h \ + NCTextPad.h \ + NCWidget.h \ + NCDialog.h \ + NCEmpty.h \ + NCSpacing.h \ + NCSquash.h \ + NCAlignment.h \ + NCFrame.h \ + NCCheckBoxFrame.h \ + NCSplit.h \ + NCReplacePoint.h \ + NCRadioButtonGroup.h \ + NCImage.h \ + NCCheckBox.h \ + NCLabel.h \ + NCProgressBar.h \ + NCMenuButton.h \ + NCPushButton.h \ + NCRadioButton.h \ + NCTextEntry.h \ + NCIntField.h \ + NCComboBox.h \ + NCPadWidget.h \ + NCRichText.h \ + NCSelectionBox.h \ + NCMultiSelectionBox.h \ + NCTable.h \ + NCTree.h \ + NCLogView.h \ + NCMultiLineEdit.h \ + NCFileSelection.h \ + NCAskForDirectory.h \ + NCAskForFile.h \ + NCPopup.h \ + NCPopupTable.h \ + NCPopupList.h \ + NCPopupMenu.h \ + NCPopupTextEntry.h \ + NCPopupInfo.h \ + NCstyle.braille.h NCstyle.mono.h \ + NCstyle.linux.h NCstyle.xterm.h \ + Y2CCNCursesUI.h \ YNCursesComponent.h +libpy2ncurses_la_SOURCES = \ + Y2Log.cc \ + position.cc \ + YNCursesUI.cc \ + \ + NCPackageSelectorPlugin.cc \ + NCPackageSelectorStart.cc \ + NCPkgTable.cc \ + \ + NCtext.cc \ + NCstring.cc \ + stringutil.cc \ + lang2encoding.tab lang2encoding.cc \ + ncursesw.cc \ + ncursesp.cc \ + NCtypes.cc \ + NCurses.cc \ + NCstyle.cc \ + NCStyleDef.cc \ + NCTableItem.cc \ + NCPad.cc \ + NCTreePad.cc \ + NCTablePad.cc \ + NCTextPad.cc \ + NCWidget.cc \ + NCDialog.cc \ + NCEmpty.cc \ + NCSpacing.cc \ + NCSquash.cc \ + NCAlignment.cc \ + NCFrame.cc \ + NCCheckBoxFrame.cc \ + NCSplit.cc \ + NCReplacePoint.cc \ + NCRadioButtonGroup.cc \ + NCImage.cc \ + NCCheckBox.cc \ + NCLabel.cc \ + NCProgressBar.cc \ + NCMenuButton.cc \ + NCPushButton.cc \ + NCRadioButton.cc \ + NCTextEntry.cc \ + NCIntField.cc \ + NCComboBox.cc \ + NCPadWidget.cc \ + NCRichText.cc \ + NCSelectionBox.cc \ + NCMultiSelectionBox.cc \ + NCTable.cc \ + NCTree.cc \ + NCLogView.cc \ + NCMultiLineEdit.cc \ + NCFileSelection.cc \ + NCAskForDirectory.cc \ + NCAskForFile.cc \ + \ + NCPopup.cc \ + NCPopupTable.cc \ + NCPopupList.cc \ + NCPopupMenu.cc \ + NCPopupTextEntry.cc \ + NCPopupInfo.cc \ + \ + Y2CCNCursesUI.cc + #libpy2ncurses_la_SOURCES = $(liby2ncurses_la_SOURCES) \ # Y2CCNCursesUI.cc Y2CCNCursesUI.h \ # YNCursesComponent.h -INCLUDES = -I$(srcdir)/pkg -I$(includedir) -I$(includedir)/yui -I$(includedir)/y2util/qt ${ZYPP_CFLAGS} +INCLUDES = -I$(srcdir)/pkg -I$(includedir) -I$(includedir)/yui -I$(includedir)/y2util/qt lang2encoding.cc: lang2encoding.tab ./lang2encoding.tab > lang2encoding.cc Modified: trunk/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.cc?rev=38… ============================================================================== --- trunk/ncurses/src/YNCursesUI.cc (original) +++ trunk/ncurses/src/YNCursesUI.cc Wed May 30 14:57:31 2007 @@ -59,8 +59,8 @@ #include "NCTree.h" #include "NCLogView.h" #include "NCMultiLineEdit.h" +#include "NCPackageSelectorPlugin.h" #include "NCPackageSelectorStart.h" -#include "NCPkgTable.h" #include "NCAskForDirectory.h" #include "NCAskForFile.h" #include "NCstring.h" @@ -573,106 +573,54 @@ // /////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : YNCursesUI::createPackageSelector -// METHOD TYPE : YWidget +// METHOD NAME : YNCursesUI::packageSelectorPlugin() +// METHOD TYPE : NCPackageSelectorPlugin // -// DESCRIPTION : Reads the layout term of the package selection dialog -// and creates the widget tree. +// DESCRIPTION : Create the package selector plugin // -YWidget * YNCursesUI::createPackageSelector( YWidget * parent, - YWidgetOpt & opt, - const YCPString & floppyDevice ) +NCPackageSelectorPlugin * YNCursesUI::packageSelectorPlugin() { - ONCREATE; - YWidget * w = 0; - try - { - w = new NCPackageSelectorStart (this, dynamic_cast<NCWidget *>(parent), opt, - YD_HORIZ, floppyDevice->value() ); - } - catch (const std::exception & e) - { - UIERR << "Caught a std::exception: " << e.what () << endl; - } - catch (...) + static NCPackageSelectorPlugin * plugin = 0; + + if ( ! plugin ) { - UIERR << "Caught an unspecified exception" << endl; + plugin = new NCPackageSelectorPlugin(); + + // This is a deliberate memory leak: If an application requires a + // PackageSelector, it is a package selection application by + // definition. In this case, the ncurses_pkg plugin is intentionally + // kept open to avoid repeated start-up cost of the plugin and libzypp. } - return w; + + return plugin; } /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : YNCursesUI::runPkgSelection -// METHOD TYPE : void +// METHOD NAME : YNCursesUI::createPackageSelector +// METHOD TYPE : YWidget // -// DESCRIPTION : Implementation of UI builtin RunPkgSelection() which -// has to be called after OpenDialog( `PackageSelector() ). +// DESCRIPTION : Calls NCPackageSelectorPlugin::createPackageSelector // -YCPValue YNCursesUI::runPkgSelection( YWidget * selector ) +YWidget * YNCursesUI::createPackageSelector( YWidget * parent, + YWidgetOpt & opt, + const YCPString & floppyDevice ) { - NCPackageSelectorStart * ncSelector = 0; - - YDialog *dialog = currentDialog(); - - if (!dialog) - { - UIERR << "ERROR package selection: No dialog existing." << endl; - } - else - { - ncSelector = dynamic_cast<NCPackageSelectorStart *>( selector ); - - // debug: dump the widget tree - dialog->dumpDialogWidgetTree(); - } - - bool result = true; - - // start event loop - NCursesEvent event = NCursesEvent::cancel; + ONCREATE; + YWidget * w = 0; - if ( ncSelector ) - { - try - { - ncSelector->showDefaultList(); - NCDialog * ncd = static_cast<NCDialog *>( dialog ); + NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); - do - { - event = ncd->userInput(); - result = ncSelector->handleEvent( event ); - NCDBG << "Result: " << (result?"true":"false") << endl; - } - while ( event != NCursesEvent::cancel && result == true ); - } - catch (const std::exception & e) - { - UIERR << "Caught a std::exception: " << e.what () << endl; - } - catch (...) - { - UIERR << "Caught an unspecified exception" << endl; - } - } - else + if ( plugin ) { - UIERR << "No NCPackageSelector existing" << endl; + w = plugin->createPackageSelector( parent, opt ); } - if ( !event.result.isNull() ) - { - UIMIL << "Return value: " << event.result->toString() << endl; - return event.result; - } - else - return YCPVoid(); + return w; } /////////////////////////////////////////////////////////////////// @@ -687,35 +635,57 @@ YWidget * YNCursesUI::createPkgSpecial( YWidget *parent, YWidgetOpt &opt, const YCPString &subwidget ) { ONCREATE; + YWidget * w = 0; + + NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); - YCPString pkgTable( "pkgTable" ); + if ( plugin ) + { + w = plugin->createPkgSpecial( parent, opt, subwidget ); + } + + return w; +} - YWidget * w = 0; - if ( subwidget->compare( pkgTable ) == YO_EQUAL ) +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : YNCursesUI::runPkgSelection +// METHOD TYPE : YCPValue +// +// DESCRIPTION : Implementation of UI builtin RunPkgSelection() which +// has to be called after OpenDialog( `PackageSelector() ). +// +YCPValue YNCursesUI::runPkgSelection( YWidget * selector ) +{ + YCPValue result = YCPVoid(); + + YDialog *dialog = YUI::currentDialog(); + NCPackageSelectorPlugin * plugin = packageSelectorPlugin(); + + if ( !dialog ) { - NCDBG << "Creating a NCPkgTable" << endl; - try - { - w = new NCPkgTable( dynamic_cast<NCWidget *>( parent ), opt ); - } - catch (const std::exception & e) - { - UIERR << "Caught a std::exception: " << e.what () << endl; - } - catch (...) - { - UIERR << "Caught an unspecified exception" << endl; - } + UIERR << "ERROR package selection: No dialog rexisting." << endl; + return YCPVoid(); } - else + if ( !selector ) + { + UIERR << "ERROR package selection: No package selector existing." << endl; + return YCPVoid(); + } + + // debug: dump the widget tree + dialog->dumpDialogWidgetTree(); + if ( plugin ) { - NCERR << "PkgSpecial( " << subwidget->toString() << " ) not found - take default `Label" << endl; - w = new NCLabel( dynamic_cast<NCWidget *>( parent ), opt, subwidget ); + result = plugin->runPkgSelection( dialog, selector ); } - return w; + + return result; } + /////////////////////////////////////////////////////////////////// // // Modified: trunk/ncurses/src/YNCursesUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.h?rev=382… ============================================================================== --- trunk/ncurses/src/YNCursesUI.h (original) +++ trunk/ncurses/src/YNCursesUI.h Wed May 30 14:57:31 2007 @@ -29,6 +29,7 @@ class YUI; class NCDialog; +class NCPackageSelectorPlugin; /** * @short YaST2 Component: NCursesUI user interface @@ -406,7 +407,12 @@ virtual YCPValue askForSaveFileName ( const YCPString & startWith, const YCPString & filter, const YCPString & headline ); - + + /** + * Returns the package selector plugin singleton of this UI or creates it + * (including loading the plugin lib) if it does not exist yet. + **/ + NCPackageSelectorPlugin * packageSelectorPlugin(); /** * UI-specific redrawScreen method. Modified: trunk/ncurses/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/Makefile.am?rev=… ============================================================================== --- trunk/ncurses/src/pkg/Makefile.am (original) +++ trunk/ncurses/src/pkg/Makefile.am Wed May 30 14:57:31 2007 @@ -17,24 +17,32 @@ -L$(libdir) -lyui \ ${ZYPP_LIBS} -noinst_HEADERS = $(wildcard *.h) +noinst_HEADERS = $(wildcard *.h) \ + NCPackageSelector.h \ + NCPkgSelMapper.h \ + NCPkgStatusStrategy.h \ + NCPkgPopupDeps.h \ + NCPkgPopupDiskspace.h \ + NCPkgPopupDescr.h \ + NCPkgPopupTable.h \ + NCPkgPopupSearch.h \ + NCPkgPopupSelection.h \ + NCPkgPopupTree.h \ + NCPkgNames.h \ + NCZypp.h libpy2ncurses_pkg_la_SOURCES = \ - NCPackageSelector.h NCPackageSelector.cc \ - NCPackageSelectorStart.h NCPackageSelectorStart.cc \ - \ - NCPkgSelMapper.h NCPkgSelMapper.cc \ - NCPkgStatusStrategy.h NCPkgStatusStrategy.cc \ - NCPkgPopupDeps.h NCPkgPopupDeps.cc \ - NCPkgPopupDiskspace.h NCPkgPopupDiskspace.cc \ - NCPkgPopupDescr.h NCPkgPopupDescr.cc \ - NCPkgPopupTable.h NCPkgPopupTable.cc \ - NCPkgPopupSearch.h NCPkgPopupSearch.cc \ - NCPkgPopupSelection.h NCPkgPopupSelection.cc \ - NCPkgPopupTree.h NCPkgPopupTree.cc \ - NCPkgTable.h NCPkgTable.cc \ - NCPkgNames.h NCPkgNames.cc \ - NCZypp.h + NCPackageSelector.cc \ + NCPkgSelMapper.cc \ + NCPkgStatusStrategy.cc \ + NCPkgPopupDeps.cc \ + NCPkgPopupDiskspace.cc \ + NCPkgPopupDescr.cc \ + NCPkgPopupTable.cc \ + NCPkgPopupSearch.cc \ + NCPkgPopupSelection.cc \ + NCPkgPopupTree.cc \ + NCPkgNames.cc INCLUDES = -I$(srcdir)/.. -I$(includedir) -I$(includedir)/yui ${ZYPP_CFLAGS} -- 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] r38205 - in /trunk/devtools: VERSION devtools/bin/check-textdomain devtools/bin/gettextdomains package/yast2-devtools.changes
by mvidner＠svn.opensuse.org 30 May '07

30 May '07

Author: mvidner Date: Wed May 30 14:56:56 2007 New Revision: 38205 URL: http://svn.opensuse.org/viewcvs/yast?rev=38205&view=rev Log: check-textdomain: Fixed --help and issues with empty lines in POTFILES (#278784). Modified: trunk/devtools/VERSION trunk/devtools/devtools/bin/check-textdomain trunk/devtools/devtools/bin/gettextdomains trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=38205&r1=38… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Wed May 30 14:56:56 2007 @@ -1 +1 @@ -2.15.0 +2.15.1 Modified: trunk/devtools/devtools/bin/check-textdomain URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/check-text… ============================================================================== --- trunk/devtools/devtools/bin/check-textdomain (original) +++ trunk/devtools/devtools/bin/check-textdomain Wed May 30 14:56:56 2007 @@ -5,8 +5,8 @@ . $CWD/gettextdomains -if [ -z $1 ]; then - echo "check-textdomain: no source-directory" +if ! [ -d "$1" ]; then + echo "Usage: check-textdomain source-directory" exit 1 else SRCDIR=$1 Modified: trunk/devtools/devtools/bin/gettextdomains URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/gettextdom… ============================================================================== --- trunk/devtools/devtools/bin/gettextdomains (original) +++ trunk/devtools/devtools/bin/gettextdomains Wed May 30 14:56:56 2007 @@ -44,7 +44,7 @@ done # we can specify additional files to .pot creation - POTFILES=`test -e $SRCDIR/POTFILES && sed "s,^,$SRCDIR/," < $SRCDIR/POTFILES` + POTFILES=`test -e $SRCDIR/POTFILES && grep -v '^$' $SRCDIR/POTFILES | sed "s,^,$SRCDIR/," ` DOMAINS="" ; for F in $TR_FILES $POTFILES; do Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Wed May 30 14:56:56 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 14:56:36 CEST 2007 - mvidner(a)suse.cz + +- check-textdomain: Fixed --help and issues with empty lines + in POTFILES (#278784). +- 2.15.1 + +------------------------------------------------------------------- Thu May 17 12:45:20 CEST 2007 - locilka(a)suse.cz - Added more words into the YaST dictionary. -- 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] r38204 - in /trunk/ncurses/src/pkg: NCPackageSelector.cc NCPackageSelector.h
by gs＠svn.opensuse.org 30 May '07

30 May '07

Author: gs Date: Wed May 30 14:53:52 2007 New Revision: 38204 URL: http://svn.opensuse.org/viewcvs/yast?rev=38204&view=rev Log: remove floppy device from params Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPackageSelector.h Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Wed May 30 14:53:52 2007 @@ -96,7 +96,7 @@ // // Constructor // -NCPackageSelector::NCPackageSelector( YNCursesUI * ui, const YWidgetOpt & opt, string floppyDevice ) +NCPackageSelector::NCPackageSelector( YNCursesUI * ui, const YWidgetOpt & opt ) : y2ui( ui ) , visibleInfo( YCPNull() ) , filterPopup( 0 ) Modified: trunk/ncurses/src/pkg/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.h (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.h Wed May 30 14:53:52 2007 @@ -118,9 +118,8 @@ * data needed for the package selection. * @param ui The NCurses UI * @param opt The widget options - * @param floppyDevice The floppy device */ - NCPackageSelector( YNCursesUI * ui, const YWidgetOpt & opt, string floppyDevice ); + NCPackageSelector( YNCursesUI * ui, const YWidgetOpt & opt ); /** * Destructor -- 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] r38203 - in /trunk/ncurses/src/pkg: NCPackageSelectorStart.cc NCPackageSelectorStart.h
by gs＠svn.opensuse.org 30 May '07

30 May '07

Author: gs Date: Wed May 30 14:53:16 2007 New Revision: 38203 URL: http://svn.opensuse.org/viewcvs/yast?rev=38203&view=rev Log: remove YNCursesUI from params Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.cc trunk/ncurses/src/pkg/NCPackageSelectorStart.h Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelectorStart.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelectorStart.cc Wed May 30 14:53:16 2007 @@ -40,16 +40,17 @@ // // DESCRIPTION : // -NCPackageSelectorStart::NCPackageSelectorStart( YNCursesUI *ui, - NCWidget * parent, - const YWidgetOpt & opt, YUIDimension dimension, - string floppyDevice ) +NCPackageSelectorStart::NCPackageSelectorStart( NCWidget * parent, + const YWidgetOpt & opt, + YUIDimension dimension ) : NCSplit( parent, opt, dimension ) , widgetRoot( 0 ) , packager( 0 ) , youMode ( false ) , updateMode ( false ) { + YNCursesUI * ui = YNCursesUI::ui(); + // set the textdomain setTextdomain( "packages" ); @@ -64,14 +65,14 @@ YCPTerm pkgLayout = YCPNull(); if ( youMode ) { - pkgLayout = readLayoutFile( ui, "/usr/share/YaST2/data/you_layout.ycp" ); + pkgLayout = readLayoutFile( "/usr/share/YaST2/data/you_layout.ycp" ); } else { - pkgLayout = readLayoutFile( ui, "/usr/share/YaST2/data/pkg_layout.ycp" ); + pkgLayout = readLayoutFile( "/usr/share/YaST2/data/pkg_layout.ycp" ); } - if ( ! pkgLayout.isNull() ) + if ( ! pkgLayout.isNull() && ui ) { YWidgetOpt childrenOpt( opt ); widgetRoot = (YContainerWidget *)ui->createWidgetTree( dynamic_cast<YWidget *>(parent), @@ -80,7 +81,7 @@ // create the PackageSelector (creation with 'new' is required because initialization // in the list of member variables causes problems with untranslated messages) - packager = new NCPackageSelector( ui, opt, floppyDevice ); + packager = new NCPackageSelector( ui, opt ); if ( widgetRoot ) { @@ -226,8 +227,7 @@ // // Read a layout file (containing a YCPTerm) // -YCPTerm NCPackageSelectorStart::readLayoutFile( YNCursesUI *ui, - const char * layoutFilename ) +YCPTerm NCPackageSelectorStart::readLayoutFile( const char * layoutFilename ) { YCPTerm pkgLayout = YCPNull(); Modified: trunk/ncurses/src/pkg/NCPackageSelectorStart.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelectorStart.h (original) +++ trunk/ncurses/src/pkg/NCPackageSelectorStart.h Wed May 30 14:53:16 2007 @@ -67,9 +67,8 @@ * Constructor * creates the widget tree of the package selector */ - NCPackageSelectorStart( YNCursesUI *ui, NCWidget * parent, - const YWidgetOpt & opt, YUIDimension dimension, - string floppyDevice ); + NCPackageSelectorStart( NCWidget * parent, + const YWidgetOpt & opt, YUIDimension dimension ); /** * Destructor @@ -105,7 +104,7 @@ * @param layoutFilename The filename * @return YCPTerm */ - YCPTerm readLayoutFile( YNCursesUI *ui, const char * layoutFilename ); + YCPTerm readLayoutFile( const char * layoutFilename ); }; -- 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] r38202 - in /trunk/packager: package/yast2-packager.changes src/modules/SlideShow.ycp
by lslezak＠svn.opensuse.org 30 May '07

30 May '07

Author: lslezak Date: Wed May 30 14:38:23 2007 New Revision: 38202 URL: http://svn.opensuse.org/viewcvs/yast?rev=38202&view=rev Log: - do not show an installation source in the package installation dialog (slideshow) when there is no package to install (#277148) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SlideShow.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed May 30 14:38:23 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 30 14:16:09 CEST 2007 - lslezak(a)suse.cz + +- do not show an installation source in the package installation + dialog (slideshow) when there is no package to install (#277148) + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/packager/src/modules/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShow.y… ============================================================================== --- trunk/packager/src/modules/SlideShow.ycp (original) +++ trunk/packager/src/modules/SlideShow.ycp Wed May 30 14:38:23 2007 @@ -993,8 +993,7 @@ foreach ( list<integer> inst_src, remaining_sizes_per_cd_per_src, ``{ y2milestone( "src #%1: %2", src_no, inst_src ); - if ( ListSum( inst_src ) > 0 // Ignore sources from where there is nothing is to install - || src_no+1 == current_src_no ) // or if this happens to be the current source + if (ListSum(inst_src) > 0) // Ignore sources from where there is nothing is to install { if ( size( total_sizes_per_cd_per_src ) > 1 ) // Multiple sources? { -- 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] r38201 - in /trunk/yast2: package/yast2.changes scripts/save_y2logs
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:49:50 2007 New Revision: 38201 URL: http://svn.opensuse.org/viewcvs/yast?rev=38201&view=rev Log: Fixed bug #278790: save_y2logs complains about missing RPM DB Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/save_y2logs Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed May 30 13:49:50 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 30 13:48:27 CEST 2007 - sh(a)suse.de + +- Fixed bug #278790: save_y2logs complains about missing RPM DB + +------------------------------------------------------------------- Tue May 29 15:53:15 CEST 2007 - lslezak(a)suse.cz - updated metadata in the sysconfig file (#278612) Modified: trunk/yast2/scripts/save_y2logs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/save_y2logs?rev=38… ============================================================================== --- trunk/yast2/scripts/save_y2logs (original) +++ trunk/yast2/scripts/save_y2logs Wed May 30 13:49:50 2007 @@ -51,9 +51,8 @@ fi RPM_LIST="rpm-qa" -# #270321, there is no rpmdb in inst-sys if [ -f /var/lib/rpm/Packages ]; then - rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' | sort >/var/log/$RPM_LIST + rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' 2>/dev/null | sort >/var/log/$RPM_LIST fi if [ -f /var/log/$RPM_LIST ]; then -- 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] r38200 - /tags/branch-SLE-10-SP1-2_13_3/product-creator/
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:48:51 2007 New Revision: 38200 URL: http://svn.opensuse.org/viewcvs/yast?rev=38200&view=rev Log: Created tag branch-SLE-10-SP1-2_13_3 for product-creator Added: tags/branch-SLE-10-SP1-2_13_3/product-creator/ - copied from r38199, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r38199 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/kiwi.ycp
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:48:43 2007 New Revision: 38199 URL: http://svn.opensuse.org/viewcvs/yast?rev=38199&view=rev Log: - select the boot image automaticaly, according to the base product (#270881) - 2.13.3 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Wed May 30 13:48:43 2007 @@ -1 +1 @@ -2.13.2 +2.13.3 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Wed May 30 13:48:43 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 30 13:28:51 CEST 2007 - jsuchome(a)suse.cz + +- select the boot image automaticaly, according to the base product + (#270881) +- 2.13.3 + +------------------------------------------------------------------- Tue May 29 14:18:19 CEST 2007 - lslezak(a)suse.cz - 2.13.2 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Wed May 30 13:48:43 2007 @@ -157,7 +157,6 @@ string sw_selection = KiwiConfig["sw_selection"]:"image"; list items = [ `item (`id ("image"), _("Image"), sw_selection == "image"), -// `item (`id ("boot"), _("Boot"), sw_selection == "boot"), ]; if (kiwi_task == "xen") items = add (items, `item (`id ("xen"), _("XEN specific" ), sw_selection == "xen")); @@ -500,8 +499,6 @@ return dir; } - - /** * handler for 'root' directory browse */ @@ -667,7 +664,19 @@ if (Kiwi::PrepareAndCreate ()) { string dir = Kiwi::MoveOutput (KiwiConfig["iso-directory"]:""); - Popup::Message (sformat (success[kiwi_task]:"", dir)); + if (kiwi_task == "usb" && false) + { + // additional question (yes/no) + if (Popup::YesNo (sformat (success[kiwi_task]:"", dir) + _(" +Save the image to the stick now?"))) + { + NotImplementedHandler ("", $[ "ID" : ""]); + } + } + else + { + Popup::Message (sformat (success[kiwi_task]:"", dir)); + } ret = true; } } @@ -720,7 +729,6 @@ if (FileUtils::Exists (kiwi_configuration + "/root")) { -// KiwiConfig["root_dir"] = kiwi_configuration + "/root"; // read all entries from root_dir and save to list map out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 -d %1/root/* 2>/dev/null", kiwi_configuration)); @@ -728,15 +736,10 @@ } if (FileUtils::Exists (kiwi_configuration + "/config")) { -// KiwiConfig["config_dir"] = kiwi_configuration + "/config"; map out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 -d %1/config/* 2>/dev/null", kiwi_configuration)); KiwiConfig["config_dir"] = filter (string f, splitstring(out["stdout"]:"", "\n"),``(f!="")); } - /* - if (FileUtils::Exists (kiwi_configuration + "/images.sh")) - KiwiConfig["images_path"] = kiwi_configuration + "/images.sh"; - */ foreach (string file, [ "images.sh", "config.sh" ], { string file_path = kiwi_configuration + "/" + file; @@ -753,63 +756,43 @@ "openSUSE 10.2" : "suse-10.2", "openSUSE 10.3" : "suse-10.3", "SUSE Linux 10.1" : "suse-10.1", - "SUSE Linux Enterprise Server 10" : "sles10" + "SUSE Linux Enterprise Server 10" : "suse-SLES10", + "SUSE Linux Enterprise Desktop 10" : "suse-SLED10" ]; - string type = KiwiConfig["type",kiwi_task,"boot"]:""; - list l = splitstring (type, ","); - if (issubstring (type, "isoboot/") && kiwi_task == "iso") - { - KiwiConfig["isoboot"] = substring (l[0]:"", search (l[0]:"","isoboot/") + 8); - } - else if (issubstring (type, "xenboot/")) - { - KiwiConfig["xenboot"] = substring (l[0]:"", search (l[0]:"","xenboot/") + 8); - } - else if (issubstring (type, "usbboot/")) - { - KiwiConfig["usbboot"] = substring (l[0]:"", search (l[0]:"","usbboot/") + 8); - } - else if (issubstring (type, "vmxboot/")) - { - KiwiConfig["vmxboot"] = substring (l[0]:"", search (l[0]:"","vmxboot/") + 8); - } + map distproduct2boot = $[ + "openSUSE-10.2-CD-download" : "suse-10.2", + "openSUSE-10.2-dvd5-download" : "suse-10.2", + "openSUSE-10.3-dvd5-download" : "suse-10.3", + "openSUSE-10.3-CD-download" : "suse-10.3", + "SUSE-Linux-10.1-CD-download-x86" : "suse-10.1", + "SUSE-Linux-Enterprise-Server-i386" : "suse-SLES10", + "SUSE-Linux-Enterprise-Desktop-i386" : "suse-SLED10", + "SUSE-Linux-Enterprise-Server-SP1" : "suse-SLES10-SP1", + "SUSE-Linux-Enterprise-Desktop-SP1" : "suse-SLED10-SP1" + ]; + string boot_image = label2boot[content["LABEL"]:""]:""; + if (boot_image == "") + boot_image = distproduct2boot[content["DISTPRODUCT"]:""]:""; // guess some default boot image value - if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && content["LABEL"]:"" != "") + if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && boot_image != "") { -// FIXME label2boot mapping is not used because we are reading default configuration -// but could we ALWAYS replace the default string??? - KiwiConfig["isoboot"] = label2boot[content["LABEL"]:""]:""; + KiwiConfig["isoboot"] = boot_image; } else if (kiwi_task == "usb") { - if (!haskey (KiwiConfig, "usbboot") && content["LABEL"]:"" != "") - KiwiConfig["usbboot"] = label2boot[content["LABEL"]:""]:""; - if (kiwi_configuration == default_dir) - { - KiwiConfig = remove (KiwiConfig, "type"); - } + if (!haskey (KiwiConfig, "usbboot") && boot_image != "") + KiwiConfig["usbboot"] = boot_image; } else if (kiwi_task == "vmx") { - if (!haskey (KiwiConfig, "vmxboot") && content["LABEL"]:"" != "") - KiwiConfig["vmxboot"] = label2boot[content["LABEL"]:""]:""; - if (kiwi_configuration == default_dir) - { - KiwiConfig = remove (KiwiConfig, "type"); - } + if (!haskey (KiwiConfig, "vmxboot") && boot_image != "") + KiwiConfig["vmxboot"] = boot_image; } else if (kiwi_task == "xen") { - /* FIXME still no other image/xenboot image than suse-10.2... if (!haskey (KiwiConfig, "xenboot")) - KiwiConfig["xenboot"] = label2boot[content["LABEL"]:""]:""; - */ - // adapt the default buildhost-suse-10.1 for xen usage - if (kiwi_configuration == default_dir) - { - KiwiConfig = remove (KiwiConfig, "type"); - } + KiwiConfig["xenboot"] = boot_image; } string name = KiwiConfig["name"]:""; if (!haskey (KiwiConfig, "specification")) @@ -833,6 +816,7 @@ "contents" : `HBox (`HSpacing(1), `VBox ( `VSpacing (0.2), + /* `HBox ( `HWeight (1, `HBox ( boot_image_widget () @@ -840,6 +824,7 @@ )), `HWeight (1, `VBox (`Label (""), `Left ("compressed"))) ), + */ `VSpacing (0.2), `HBox ( `HWeight (1, "version"), @@ -848,46 +833,18 @@ "sw_selection", `HBox ( `HWeight (1, `VBox ( -// `Left (`Label (_("Software for image"))), "rt_sw", `Right ("configure_sw") `Left (`Label (_("Installed software"))), "rt_sw", `Right ("configure_sw") )), `HWeight (1, "ignore") - /* - `VBox ( - `Left (`Label (_("Packages to ignore"))), - "rt_sw_ignore", - `Right ("configure_sw_ignore") - ) - */ - /* - `VBox ( - `Left (`Label (_("Software for build"))), - "rt_sw_boot", - `Right ("configure_sw_boot") - ) - */ ), - /* - `HBox ( - "output_dir", - `VBox (`Label (""), "browse_output_dir") - ), - */ `VSpacing (0.2) ), `HSpacing(1)), "widget_names" : [ -// "isoboot", - boot_image_widget (), -// "configure_boot", - "compressed", "version", "size", "sizeunit", "sw_selection", "rt_sw", "configure_sw", "ignore", -// "rt_sw_ignore", "configure_sw_ignore", -// "rt_sw_boot", "configure_sw_boot", -// "output_dir", "browse_output_dir", ], ], "description" : $[ @@ -930,27 +887,12 @@ `VBox ( "general_scripts", `VSpacing (0.2), - /* - `HBox ( - "autoyast_path", - `VBox (`Label (""), "browse_autoyast") - ), - */ - /* - `HBox ( - "images_path", - `VBox (`Label (""), "browse_images_path") - ), - */ `HBox ("config.sh", `Bottom ("import_config.sh")), `HBox ("images.sh", `Bottom ("import_images.sh")), `VSpacing (0.2) ), `HSpacing (1)), "widget_names" : [ "general_scripts", -// "root_dir", "browse_root_dir", "config_dir", "browse_config_dir", -// "autoyast_path", "browse_autoyast", -// "images_path", "browse_images_path", "config.sh", "import_config.sh", "images.sh", "import_images.sh", ], @@ -962,12 +904,6 @@ `VBox ( "general_directories", `VSpacing (0.2), - /* - `HBox ( - "root_dir", - `VBox (`Label (""), "browse_root_dir") - ), - */ "root_dir_table", `VSpacing (0.2), `HBox ("root_dir_add", `Left ("root_dir_delete")), @@ -976,26 +912,12 @@ `VSpacing (0.2), `HBox ("config_dir_add", `Left ("config_dir_delete")), `VSpacing (0.2), - /* - `HBox ( - "config_dir", - `VBox (`Label (""), "browse_config_dir") - ), - */ - /* - `HBox ( - "autoyast_path", - `VBox (`Label (""), "browse_autoyast") - ), - */ `VSpacing (0.2) ), `HSpacing (1)), "widget_names" : [ "general_directories", -// "root_dir", "browse_root_dir", "root_dir_table", "root_dir_add", "root_dir_delete", "config_dir_table", "config_dir_add", "config_dir_delete", -// "config_dir", "browse_config_dir", ], ], ]; @@ -1247,7 +1169,6 @@ "no_help" : true, "handle" : HandleDeleteFromConfigDir, ], - "config.sh" : $[ "widget" : `multi_line_edit, // textentry label @@ -1293,24 +1214,6 @@ "help" : "", "handle" : HandleBrowseAutoYaSTFile ], - /* - "images_path" : $[ - "widget" : `textentry, - // textentry label - "label" : _("Pat&h to cleanup script"), - "help" : _("Choose the path to optional cleanup script (<tt>images.sh</tt>). This script is called at the beginning of the image creation process."), - "init" : InitDescription, - "store" : StoreDescription, - "handle" : HandleDescription, - ], - "browse_images_path": $[ - "widget" : `push_button, - // push button label - "label" : _("Brows&e..."), - "help" : "", - "handle" : HandleBrowseImagesFile - ], - */ "images.sh" : $[ "widget" : `multi_line_edit, // textentry label @@ -1436,7 +1339,7 @@ // dialog caption "usb" : _("USB stick Image Configuration"), // button label - "vmx" : _("Virtual Disk Image Image"), + "vmx" : _("Virtual Disk Image"), ]; map next_button = $[ // button label -- 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] r38198 - /tags/stable-2_15_10/add-on-creator/
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:47:24 2007 New Revision: 38198 URL: http://svn.opensuse.org/viewcvs/yast?rev=38198&view=rev Log: Created tag stable-2_15_10 for add-on-creator Added: tags/stable-2_15_10/add-on-creator/ - copied from r38197, trunk/add-on-creator/ -- 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] r38197 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:47:07 2007 New Revision: 38197 URL: http://svn.opensuse.org/viewcvs/yast?rev=38197&view=rev Log: - added support for source rpm's (#279004) - 2.15.10 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=38197… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Wed May 30 13:47:07 2007 @@ -1 +1 @@ -2.15.9 +2.15.10 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Wed May 30 13:47:07 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 30 10:09:52 CEST 2007 - jsuchome(a)suse.cz + +- added support for source rpm's (#279004) +- 2.15.10 + +------------------------------------------------------------------- Tue May 22 10:42:36 CEST 2007 - jsuchome(a)suse.cz - enable rpm directory with .rpm extension (#276861) Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Wed May 30 13:47:07 2007 @@ -592,6 +592,9 @@ // mapping of package name to full file name global map<string,string> package2filename = $[]; +// mapping of source package name to full file name +global map<string,string> srcpackage2filename = $[]; + // if we want only to sign existing product (and possibly create iso of it) global boolean only_sign_product = false; @@ -1004,17 +1007,23 @@ y2milestone ("asking the RPM's for ARCH and NAME..."); foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; - out = (map) SCR::Execute (.target.bash_output, - sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\"", f)); + sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); list lines = splitstring (out["stdout"]:"", "\n"); string arch = lines[0]:""; string name = lines[1]:""; + string sourcerpm = lines[2]:""; + // 'arch' is directory where to put final package + if (sourcerpm == "src") + arch = "src"; if (name != "" && arch != "") { available_packages[arch] = add ( available_packages[arch]:[], name); - package2filename[name] = f; + if (arch != "src") + package2filename[name] = f; + else + srcpackage2filename[name] = f; } }); y2milestone ("... done"); @@ -1437,13 +1446,20 @@ if (arch != "ZZZ_imported" && arch != "ZZZ_required" && FileUtils::Exists (out_dir)) { - if (size (package2filename) > 0) + if (size (package2filename) > 0 && arch != "src") { foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", package2filename[p]:"", out_dir)); }); } + else if (size (srcpackage2filename) > 0 && arch == "src") + { + foreach (string p, (list<string>) pa, { + SCR::Execute (.target.bash, sformat ( + "/bin/cp %1 '%2/'", srcpackage2filename[p]:"", out_dir)); + }); + } else { foreach (string p, (list<string>) pa, { -- 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] r38196 - /trunk/yast2/library/gpg/testsuite/
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:42:58 2007 New Revision: 38196 URL: http://svn.opensuse.org/viewcvs/yast?rev=38196&view=rev Log: ignore generated stuff Modified: trunk/yast2/library/gpg/testsuite/ (props changed) -- 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] r38195 - /trunk/yast2/library/control/testsuite/
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:41:54 2007 New Revision: 38195 URL: http://svn.opensuse.org/viewcvs/yast?rev=38195&view=rev Log: ignore generated stuff Modified: trunk/yast2/library/control/testsuite/ (props changed) -- 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] r38194 - /trunk/yast2/library/gpg/src/
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:39:14 2007 New Revision: 38194 URL: http://svn.opensuse.org/viewcvs/yast?rev=38194&view=rev Log: ignore generated stuff Modified: trunk/yast2/library/gpg/src/ (props changed) -- 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] r38193 - /trunk/yast2/library/gpg/doc/autodocs/
by sh-sh-sh＠svn.opensuse.org 30 May '07

30 May '07

Author: sh-sh-sh Date: Wed May 30 13:38:24 2007 New Revision: 38193 URL: http://svn.opensuse.org/viewcvs/yast?rev=38193&view=rev Log: ignore generated stuff Modified: trunk/yast2/library/gpg/doc/autodocs/ (props changed) -- 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] r38192 - /tags/branch-SLE-10-SP1-2_13_21/add-on-creator/
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:30:25 2007 New Revision: 38192 URL: http://svn.opensuse.org/viewcvs/yast?rev=38192&view=rev Log: Created tag branch-SLE-10-SP1-2_13_21 for add-on-creator Added: tags/branch-SLE-10-SP1-2_13_21/add-on-creator/ - copied from r38191, branches/SuSE-SLE-10-SP1-Branch/add-on-creator/ -- 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] r38191 - in /branches/SuSE-SLE-10-SP1-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 30 May '07

30 May '07

Author: jsuchome Date: Wed May 30 13:30:12 2007 New Revision: 38191 URL: http://svn.opensuse.org/viewcvs/yast?rev=38191&view=rev Log: - added support for source rpm's (#279004) - 2.13.21 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION Wed May 30 13:30:12 2007 @@ -1 +1 @@ -2.13.20 +2.13.21 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes Wed May 30 13:30:12 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 30 10:06:57 CEST 2007 - jsuchome(a)suse.cz + +- added support for source rpm's (#279004) +- 2.13.21 + +------------------------------------------------------------------- Tue May 22 10:40:53 CEST 2007 - jsuchome(a)suse.cz - enable rpm directory with .rpm extension (#276861) Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Wed May 30 13:30:12 2007 @@ -592,6 +592,9 @@ // mapping of package name to full file name global map<string,string> package2filename = $[]; +// mapping of source package name to full file name +global map<string,string> srcpackage2filename = $[]; + // if we want only to sign existing product (and possibly create iso of it) global boolean only_sign_product = false; @@ -1004,17 +1007,23 @@ y2milestone ("asking the RPM's for ARCH and NAME..."); foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; - out = (map) SCR::Execute (.target.bash_output, - sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\"", f)); + sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); list lines = splitstring (out["stdout"]:"", "\n"); string arch = lines[0]:""; string name = lines[1]:""; + string sourcerpm = lines[2]:""; + // 'arch' is directory where to put final package + if (sourcerpm == "src") + arch = "src"; if (name != "" && arch != "") { available_packages[arch] = add ( available_packages[arch]:[], name); - package2filename[name] = f; + if (arch != "src") + package2filename[name] = f; + else + srcpackage2filename[name] = f; } }); y2milestone ("... done"); @@ -1437,13 +1446,20 @@ if (arch != "ZZZ_imported" && arch != "ZZZ_required" && FileUtils::Exists (out_dir)) { - if (size (package2filename) > 0) + if (size (package2filename) > 0 && arch != "src") { foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", package2filename[p]:"", out_dir)); }); } + else if (size (srcpackage2filename) > 0 && arch == "src") + { + foreach (string p, (list<string>) pa, { + SCR::Execute (.target.bash, sformat ( + "/bin/cp %1 '%2/'", srcpackage2filename[p]:"", out_dir)); + }); + } else { foreach (string p, (list<string>) pa, { -- 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] r38190 - /trunk/autoinstallation/src/clients/autoyast.ycp
by ug＠svn.opensuse.org 30 May '07

30 May '07

Author: ug Date: Wed May 30 11:46:12 2007 New Revision: 38190 URL: http://svn.opensuse.org/viewcvs/yast?rev=38190&view=rev Log: commandline helptext fixed Modified: trunk/autoinstallation/src/clients/autoyast.ycp Modified: trunk/autoinstallation/src/clients/autoyast.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aut… ============================================================================== --- trunk/autoinstallation/src/clients/autoyast.ycp (original) +++ trunk/autoinstallation/src/clients/autoyast.ycp Wed May 30 11:46:12 2007 @@ -52,12 +52,12 @@ "id" : "autoyast2", "help" : _("autoyast"), "actions" : $[ - "file" : $[ "handler":openFile, "help":"sure" ] + "file" : $[ "handler":openFile, "help":"file operations" ] ], "options" : $[ "filename": $[ "type":"string", - "help":"no help" + "help":"filename=XML_PROFILE" ] ], "mappings" : $[ -- 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] r38189 - /tags/stable-2_15_37/network/
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:35:22 2007 New Revision: 38189 URL: http://svn.opensuse.org/viewcvs/yast?rev=38189&view=rev Log: Created tag stable-2_15_37 for network Added: tags/stable-2_15_37/network/ - copied from r38188, trunk/network/ -- 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] r38188 - /tags/stable-2_15_27/installation/
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:35:00 2007 New Revision: 38188 URL: http://svn.opensuse.org/viewcvs/yast?rev=38188&view=rev Log: Created tag stable-2_15_27 for installation Added: tags/stable-2_15_27/installation/ - copied from r38187, trunk/installation/ -- 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] r38187 - in /trunk/network: package/yast2-network.changes src/dsl/dialogs.ycp yast2-network.spec.in
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:34:28 2007 New Revision: 38187 URL: http://svn.opensuse.org/viewcvs/yast?rev=38187&view=rev Log: fixed spec requirements Modified: trunk/network/package/yast2-network.changes trunk/network/src/dsl/dialogs.ycp trunk/network/yast2-network.spec.in Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed May 30 11:34:28 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 30 11:34:16 CEST 2007 - mzugec(a)suse.cz + +- fixed spec requirements + +------------------------------------------------------------------- Tue May 29 12:56:38 CEST 2007 - mzugec(a)suse.cz - add Confirm::MustBeRoot to all network modules (#276478) Modified: trunk/network/src/dsl/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/dsl/dialogs.ycp?rev=… ============================================================================== --- trunk/network/src/dsl/dialogs.ycp (original) +++ trunk/network/src/dsl/dialogs.ycp Wed May 30 11:34:28 2007 @@ -25,6 +25,7 @@ include "network/runtime.ycp"; include "network/routines.ycp"; include "network/widgets.ycp"; +include "network/installation/dialogs.ycp"; /** * DSL device dialog @@ -119,6 +120,7 @@ ifaces = add(ifaces, interface); y2debug("ifaces=%1", ifaces); + y2internal("ifaces=%1", ifaces); ifaces = maplist(string e, (list<string>) ifaces, { return `item(`id(sformat("%1", e)), sformat("%1", e), e == interface); }); @@ -146,6 +148,11 @@ ["USERCONTROL", "STARTMODE",], widget_descr); +NetworkDevices::Read(); + map <string, string> device_descr = GetDeviceDescription(Internet::device); +y2internal("device_descr %1", device_descr); +string connection_text = _("%1 - %2 (%3)"); + /* DSL dialog contents */ term contents = `HBox( `HSpacing(6), @@ -162,15 +169,20 @@ `VSpacing(0.2), `HBox( /* ComboBox label */ - `Left(`ReplacePoint(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces))), +// `Left(`ReplacePoint(`id(`rp), `ComboBox(`id(`interface), _("&Ethernet Card"), ifaces))), + /* RadioButton label */ + `Left(`ReplacePoint(`id(`rp), `Label(`id(`yes), sformat(connection_text, device_descr["name"]:"", device_descr["type"]:"", device_descr["ipaddr"]:_("No IP address assigned"))))), + // push button label + `Right(`PushButton(`id(`net_expert), _("&Change Device"))) /* TextEntry label */ // `TextEntry(`id(`interface), _("&Ethernet Card"), interface), - `HSpacing(1), +// `HSpacing(1), +/* `VBox( `Label(""), - /* PushButton label */ `PushButton(`id(`lan), _("&Configure Network Cards")) ) +*/ ), `VSpacing(0.2), /* TextEntry label */ Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?re… ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Wed May 30 11:34:28 2007 @@ -5,7 +5,8 @@ BuildRequires: pkgconfig perl-XML-Writer rpm BuildRequires: update-desktop-files BuildRequires: yast2-devtools yast2-testsuite yast2 -BuildRequires: yast2-country yast2-installation +BuildRequires: yast2-country +BuildRequires: yast2-installation >= 2.15.27 # String::Random # Linuxrc::display_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] r38186 - in /trunk/installation: package/yast2-installation.changes yast2-installation.spec.in
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:34:15 2007 New Revision: 38186 URL: http://svn.opensuse.org/viewcvs/yast?rev=38186&view=rev Log: fixed spec requirements Modified: trunk/installation/package/yast2-installation.changes trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed May 30 11:34:15 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 30 11:33:52 CEST 2007 - mzugec(a)suse.cz + +- fixed spec requirements + +------------------------------------------------------------------- Mon May 28 16:02:38 CEST 2007 - mzugec(a)suse.cz - removed netsetup item from control files Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.… ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Wed May 30 11:34:15 2007 @@ -13,7 +13,7 @@ Requires: yast2-bootloader # Language::selection_skipped, bugzilla #223258 Requires: yast2-country >= 2.15.0 -Requires: yast2-network +Requires: yast2-network >= 2.15.37 # PackagesUI::ConfirmLicenses, bugzilla #256627 Requires: yast2-packager >= 2.15.24 -- 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] r38185 - /tags/stable-2_15_27/installation/
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:31:27 2007 New Revision: 38185 URL: http://svn.opensuse.org/viewcvs/yast?rev=38185&view=rev Log: fixed specfile requirements Removed: tags/stable-2_15_27/installation/ -- 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] r38184 - /tags/stable-2_15_37/network/
by mzugec＠svn.opensuse.org 30 May '07

30 May '07

Author: mzugec Date: Wed May 30 11:30:26 2007 New Revision: 38184 URL: http://svn.opensuse.org/viewcvs/yast?rev=38184&view=rev Log: fixed specfile requirements Removed: tags/stable-2_15_37/network/ -- 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] r38183 - in /trunk/ftp-server: config/ftp-server.rnc src/FtpServer.ycp src/dialogs.ycp src/uiforms.ycp src/wid_functions.ycp src/write_load.ycp
by juhliarik＠svn.opensuse.org 29 May '07

29 May '07

Author: juhliarik Date: Tue May 29 17:05:37 2007 New Revision: 38183 URL: http://svn.opensuse.org/viewcvs/yast?rev=38183&view=rev Log: added new option for uploading (vsftpd) Modified: trunk/ftp-server/config/ftp-server.rnc trunk/ftp-server/src/FtpServer.ycp trunk/ftp-server/src/dialogs.ycp trunk/ftp-server/src/uiforms.ycp trunk/ftp-server/src/wid_functions.ycp trunk/ftp-server/src/write_load.ycp Modified: trunk/ftp-server/config/ftp-server.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/config/ftp-server.rnc… ============================================================================== --- trunk/ftp-server/config/ftp-server.rnc (original) +++ trunk/ftp-server/config/ftp-server.rnc Tue May 29 17:05:37 2007 @@ -35,5 +35,7 @@ element CertFile { text }? & element VirtualUser { text }? & element FTPUser { text }? & - element GuestUser { text }? + element GuestUser { text }? & + element EnableUpload { text }? + } \ No newline at end of file Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev… ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Tue May 29 17:05:37 2007 @@ -146,7 +146,7 @@ "UmaskAnon", "UmaskLocal", "PasMinPort", "PasMaxPort", "MaxIdleTime", "MaxClientsPerIP", "MaxClientsNumber", "LocalMaxRate", "AnonMaxRate", "AnonAuthen", "AnonReadOnly", "AnonCreatDirs", "Banner", "SSLEnable", "TLS", "AntiWarez", "SSL", "StartXinetd", -"PassiveMode", "CertFile", "SSLv2", "SSLv3", "VirtualUser", "FTPUser", "GuestUser"]; +"PassiveMode", "CertFile", "SSLv2", "SSLv3", "VirtualUser", "FTPUser", "GuestUser", "EnableUpload"]; /** * map of deafult values for options in UI @@ -186,6 +186,7 @@ "VirtualUser" : "NO", "FTPUser" : "ftp", "GuestUser" : "", + "EnableUpload" : "NO", ]; Modified: trunk/ftp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/dialogs.ycp?rev=3… ============================================================================== --- trunk/ftp-server/src/dialogs.ycp (original) +++ trunk/ftp-server/src/dialogs.ycp Tue May 29 17:05:37 2007 @@ -223,11 +223,13 @@ result["custom_widget"] = `VBox(); result["init"] = InitAnonSettings; result["store"] = StoreAnonSettings; + result["handle"] = HandleAnonSettings; result["help"] = DialogHelpText("anon_settings"); return result; } + /** * Init function where are added UI hadle functions * Expert Settings widget (vsftpd) @@ -431,6 +433,28 @@ /** * Init function where are added UI hadle functions + * Anonymous Settings widget + * define for tabs_vsftpd/tabs_pureftpd necessary later in screens (CWNTree) + * + * @return map<string,any> map for Anonymous Settings widget + */ + +map<string,any> vsftpd_anon_settings () { + map<string,any> result = $[]; + + result["contents"] = `VBox ( + VsftpdAnonSettings() + ); + // TRANSLATORS: part of dialog caption + result["caption"] = _("FTP Anonymous Settings"); + // TRANSLATORS: tree menu item + result["tree_item_label"] = _("Authentication"); + result["widget_names"] = [ "DisBackButton", "AnonSettings"]; + + return result; +} +/** + * Init function where are added UI hadle functions * Expert Settings widget (vsftpd) * define for tabs_vsftpd necessary later in screens (CWNTree) * @@ -513,7 +537,7 @@ "VSFTPDAddSettings": VSFTPDSettings(), - "PUREFTPDAddSettings": PUREFTPDAddSettings (), + //"PUREFTPDAddSettings": PUREFTPDAddSettings (), "RBVsPureFTPd" : RBVsftpdPureftpd (), @@ -537,7 +561,7 @@ "perfor_settings" :perfor_settings (), - "anon_settings" : anon_settings (), + "anon_settings" : vsftpd_anon_settings (), "addit_settings" : addit_settings (), Modified: trunk/ftp-server/src/uiforms.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/uiforms.ycp?rev=3… ============================================================================== --- trunk/ftp-server/src/uiforms.ycp (original) +++ trunk/ftp-server/src/uiforms.ycp Tue May 29 17:05:37 2007 @@ -94,6 +94,49 @@ } + + + + + + +term VsftpdAnonSettings() { + term dialog = `VBox ( + `Frame ( _("Enable/Disable Anonymous and Local Users"), + `RadioButtonGroup(`id("AnonAuthen"), + `HBox(`HSpacing(1),`VBox( + `Left(`RadioButton(`id(0), "Anonymo&us Only")), + `Left(`RadioButton(`id(1), "Aut&henticated Users Only", true)), + `Left(`RadioButton(`id(2), "&Both")) + )) + ) //end of `HBox(`HSpacing(1),`RadioButtonGroup(`id("AnonAuthen") + ), //end of `Frame ( _("Enable/Disable Anonymous and Local Users") + `VSpacing(1), + `Frame ( _("Uploading"), + `HBox(`HSpacing(1),`VBox ( + `Left(`CheckBox (`id("EnableUpload"), `opt(`notify), _("&Enable Upload"))), + `HBox(`HSpacing(2),`VBox( + `Left(`CheckBox (`id("AnonReadOnly"), _("Anon&ymous Can Upload"))), + `Left(`CheckBox (`id("AnonCreatDirs"), _("Anonymou&s Can Create Directories"))) + )) + )) + ), //end of `Frame ( _("Anonymous Settings") + `VStretch() + ); + return dialog; +} + + + + + + + + + + + + term FTPAnonSettings() { term dialog = `VBox ( `Frame ( _("Enable/Disable Anonymous and Local Users"), @@ -118,6 +161,11 @@ } + + + + + term VSFTPDAddSettings() { term dialog = `VBox ( `CheckBoxFrame ( `id("PassiveMode"), _("Pass&ive Mode"), true, Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp… ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Tue May 29 17:05:37 2007 @@ -307,7 +307,7 @@ } /** - * Init function for performance settings + * Init function for anon settings * change ValidChars from textentry */ void InitAnonSettings(string key) { @@ -318,13 +318,19 @@ (FtpServer::ValueUIEdit("AnonReadOnly") == "NO")); UI::ChangeWidget(`id( "AnonCreatDirs" ), `Value, (FtpServer::ValueUIEdit("AnonCreatDirs") == "YES")); - - + if (FtpServer::vsftpd_edit) { + UI::ChangeWidget(`id( "EnableUpload" ), `Value, + (FtpServer::ValueUIEdit("EnableUpload") == "YES")); + if (!((boolean) UI::QueryWidget(`id("EnableUpload"), `Value))) { + UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, false); + UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, false); + } + } } /** - * Store function for performance settings + * Store function for anon settings * save values to temporary structure */ void StoreAnonSettings (string key, map event) { @@ -334,11 +340,35 @@ }); FtpServer::WriteToEditMap("AnonReadOnly", (((boolean) UI::QueryWidget(`id("AnonReadOnly"), `Value) == true) ? "NO":"YES")); - + if (FtpServer::vsftpd_edit) + FtpServer::WriteToEditMap("EnableUpload", (((boolean) UI::QueryWidget(`id("EnableUpload"), `Value) == true) ? "YES":"NO")); +} + +/** + * Handle function for anon settings + * save values to temporary structure + */ + +symbol HandleAnonSettings(string key, map event) { + if (FtpServer::vsftpd_edit) { + any button = event["ID"]:nil; + if (button == "EnableUpload") { + boolean check_upload = (boolean) UI::QueryWidget(`id("EnableUpload"), `Value); + if (check_upload) { + UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, true); + UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, true); + } else { + UI::ChangeWidget(`id("AnonReadOnly"), `Enabled, false); + UI::ChangeWidget(`id( "AnonCreatDirs" ),`Enabled, false); + } + } // end of if (button == "EnableUpload") { + } // end of if (FtpServer::vsftpd_edit) { } + + /** * Init function for pure-ftp-server add settings * change values a display correct widget Modified: trunk/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/write_load.ycp?re… ============================================================================== --- trunk/ftp-server/src/write_load.ycp (original) +++ trunk/ftp-server/src/write_load.ycp Tue May 29 17:05:37 2007 @@ -703,10 +703,13 @@ if (FtpServer::vsftpd_edit) { if (write) { yes_no = FtpServer::EDIT_SETTINGS["AnonReadOnly"]:nil; - if (yes_no == "YES") + if (yes_no == "YES") { FtpServer::VS_SETTINGS["anon_upload_enable"] = "NO"; - else + FtpServer::VS_SETTINGS["write_enable"] = "NO"; + } else { FtpServer::VS_SETTINGS["anon_upload_enable"] = "YES"; + FtpServer::VS_SETTINGS["write_enable"] = "YES"; + } } else { if (haskey(FtpServer::VS_SETTINGS, "anon_upload_enable")) { yes_no = toupper(FtpServer::VS_SETTINGS["anon_upload_enable"]:nil); @@ -728,7 +731,9 @@ case("AnonCreatDirs"): if (vsftpd_edit) { if (write) { - FtpServer::VS_SETTINGS["anon_mkdir_write_enable"] = EDIT_SETTINGS["AnonCreatDirs"]:nil; + FtpServer::VS_SETTINGS["anon_mkdir_write_enable"] = FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil; + if (FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil == "YES") + FtpServer::VS_SETTINGS["write_enable"] = "YES"; } else { return ((haskey(FtpServer::VS_SETTINGS, "anon_mkdir_write_enable") ? toupper(FtpServer::VS_SETTINGS["anon_mkdir_write_enable"]:nil) : FtpServer::DEFAULT_CONFIG["AnonCreatDirs"]:nil)); @@ -743,6 +748,25 @@ toupper(FtpServer::PURE_SETTINGS["AnonymousCanCreateDirs"]:nil):FtpServer::DEFAULT_CONFIG["AnonCreatDirs"]:nil)); } break; + //only vsftpd + case("EnableUpload"): + if (FtpServer::vsftpd_edit) { + if (write) { + if (FtpServer::EDIT_SETTINGS["EnableUpload"]:nil != "") + FtpServer::VS_SETTINGS["write_enable"] = FtpServer::EDIT_SETTINGS["EnableUpload"]:nil; + else + FtpServer::VS_SETTINGS["write_enable"] = nil; + } else { + return ((haskey(FtpServer::VS_SETTINGS, "write_enable") ? + FtpServer::VS_SETTINGS["write_enable"]:nil : FtpServer::DEFAULT_CONFIG["EnableUpload"]:nil)); + } + } else { + if (!write) + return FtpServer::DEFAULT_CONFIG["EnableUpload"]:nil; + else + return ""; + } + break; //only vsftpd case("Banner"): -- 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] r38182 - in /trunk/autoinstallation: package/autoyast2.changes src/clients/autoyast.ycp
by ug＠svn.opensuse.org 29 May '07

29 May '07

Author: ug Date: Tue May 29 16:32:44 2007 New Revision: 38182 URL: http://svn.opensuse.org/viewcvs/yast?rev=38182&view=rev Log: added command line interface for opening files Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/autoyast.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue May 29 16:32:44 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 29 16:32:15 CEST 2007 - ug(a)suse.de + +- added command line interface for opening files + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/autoinstallation/src/clients/autoyast.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aut… ============================================================================== --- trunk/autoinstallation/src/clients/autoyast.ycp (original) +++ trunk/autoinstallation/src/clients/autoyast.ycp Tue May 29 16:32:44 2007 @@ -18,6 +18,7 @@ import "Sequencer"; import "Popup"; import "AddOnProduct"; + import "CommandLine"; include "autoinstall/dialogs.ycp"; include "autoinstall/conftree.ycp"; @@ -37,6 +38,63 @@ Pkg::CallbackAcceptFileWithoutChecksum("AutoInstall::callbackTrue"); Pkg::CallbackAcceptUnsignedFile("AutoInstall::callbackTrue"); + void openFile( map <string, any> options ) { + if( !Profile::ReadXML( options["filename"]:"" ) ) { + Popup::Error(_("Error while parsing the control file. +Check the log files for more details or fix the +control file and try again. +")); + } + } + + + map cmdline = $[ + "id" : "autoyast2", + "help" : _("autoyast"), + "actions" : $[ + "file" : $[ "handler":openFile, "help":"sure" ] + ], + "options" : $[ + "filename": $[ + "type":"string", + "help":"no help" + ] + ], + "mappings" : $[ + "file" : ["filename"] + ] + ]; + if(!CommandLine::Init(cmdline, WFM::Args())) + { + y2error("Commandline init failed"); + return (symbol)AutoSequence (); + } + // command line options + /* Init variables */ + string command = ""; + list flags = []; + map<string,any> options = $[]; + string exit = ""; + list l = []; + + while(!CommandLine::Done()) + { + map m = CommandLine::Command(); + command = m["command"]:"exit"; + options = m["options"]:$[]; + + if( command == "file" ) { + openFile(options); + } else { + /* maybe we got "exit" or "quit" */ + if( !CommandLine::Done() ) { + CommandLine::Print("Unknown command (should not happen)"); + continue; + } + } + } + + symbol ret = (symbol)AutoSequence (); AddOnProduct::CleanModeConfigSources(); return ret; -- 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] r38181 - /trunk/ncurses/POTFILES
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 16:30:48 2007 New Revision: 38181 URL: http://svn.opensuse.org/viewcvs/yast?rev=38181&view=rev Log: -- 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] r38180 - /trunk/ncurses/src/NCPopupInfo.h
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 16:29:01 2007 New Revision: 38180 URL: http://svn.opensuse.org/viewcvs/yast?rev=38180&view=rev Log: textdomain added Modified: trunk/ncurses/src/NCPopupInfo.h Modified: trunk/ncurses/src/NCPopupInfo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPopupInfo.h?rev=38… ============================================================================== --- trunk/ncurses/src/NCPopupInfo.h (original) +++ trunk/ncurses/src/NCPopupInfo.h Tue May 29 16:29:01 2007 @@ -32,6 +32,11 @@ #include "NCPushButton.h" #include "NCi18n.h" + +/* + Textdomain "packages" +*/ + class YCPValue; /////////////////////////////////////////////////////////////////// -- 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] r38179 - /trunk/ncurses/POTFILES
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 16:26:56 2007 New Revision: 38179 URL: http://svn.opensuse.org/viewcvs/yast?rev=38179&view=rev Log: again and better Modified: trunk/ncurses/POTFILES Modified: trunk/ncurses/POTFILES URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/POTFILES?rev=38179&r1=38… ============================================================================== --- trunk/ncurses/POTFILES (original) +++ trunk/ncurses/POTFILES Tue May 29 16:26:56 2007 @@ -4,12 +4,12 @@ ./src/NCurses.cc ./src/NCDialog.cc ./src/NCPopupInfo.h -pkg/NCPkgTable.cc -pkg/pkg_layout.ycp -pkg/NCPkgPopupDiskspace.cc -pkg/NCPkgNames.cc -pkg/NCPkgPopupSearch.cc -pkg/NCPkgPopupDeps.cc -pkg/NCPackageSelector.cc -pkg/you_layout.ycp +./src/pkg/NCPkgTable.cc +./src/pkg/pkg_layout.ycp +./src/pkg/NCPkgPopupDiskspace.cc +./src/pkg/NCPkgNames.cc +./src/pkg/NCPkgPopupSearch.cc +./src/pkg/NCPkgPopupDeps.cc +./src/pkg/NCPackageSelector.cc +./src/pkg/you_layout.ycp -- 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] r38178 - /trunk/ncurses/POTFILES
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 16:25:59 2007 New Revision: 38178 URL: http://svn.opensuse.org/viewcvs/yast?rev=38178&view=rev Log: Pkg manager related stuff moved into pkg/ subdirectory Modified: trunk/ncurses/POTFILES Modified: trunk/ncurses/POTFILES URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/POTFILES?rev=38178&r1=38… ============================================================================== --- trunk/ncurses/POTFILES (original) +++ trunk/ncurses/POTFILES Tue May 29 16:25:59 2007 @@ -1,6 +1,15 @@ -./src/PkgNames.cc ./src/NCFileSelection.cc ./src/NCAskForDirectory.cc ./src/NCAskForFile.cc ./src/NCurses.cc ./src/NCDialog.cc +./src/NCPopupInfo.h +pkg/NCPkgTable.cc +pkg/pkg_layout.ycp +pkg/NCPkgPopupDiskspace.cc +pkg/NCPkgNames.cc +pkg/NCPkgPopupSearch.cc +pkg/NCPkgPopupDeps.cc +pkg/NCPackageSelector.cc +pkg/you_layout.ycp + -- 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] r38177 - in /trunk/storage: libstorage/src/AppUtil.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 29 May '07

29 May '07

Author: aschnell Date: Tue May 29 16:18:21 2007 New Revision: 38177 URL: http://svn.opensuse.org/viewcvs/yast?rev=38177&view=rev Log: - fixed crash during detection (caused by empty key-value-pair) (bug #278169) Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Tue May 29 16:18:21 2007 @@ -347,7 +347,9 @@ if( (pos=i->find_first_of( delim ))!=string::npos ) { k = i->substr( 0, pos ); - v = i->substr( i->find_first_not_of( delim, pos+1 ) ); + string::size_type pos2 = i->find_first_not_of( delim, pos+1 ); + if( pos2 != string::npos ) + v = i->substr( pos2 ); } if( !removeSur.empty() ) { @@ -360,7 +362,8 @@ if( !v.empty() && (pos=v.find_last_of(removeSur))==v.size()-1 ) v.erase( v.find_last_not_of(removeSur)+1 ); } - ret[k] = v; + if( !k.empty() && !v.empty() ) + ret[k] = v; } return( ret ); } Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue May 29 16:18:21 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 16:20:34 CEST 2007 - aschnell(a)suse.de + +- fixed crash during detection (caused by empty key-value-pair) + (bug #278169) + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) @@ -31,7 +37,7 @@ ------------------------------------------------------------------- Mon May 14 11:15:42 CEST 2007 - fehr(a)suse.de -- adapt to new parted version 1.8.7 ("linux-swap(new)" instead of +- adapt to new parted version 1.8.7 ("linux-swap(new)" instead of "linux-swap") - fix wrong crypttab entry for encrypted swap with password (#273572) - prevent bind mounts from confusing mount detection (#271720) -- 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] r38176 - in /trunk/yast2: data/sysconfig.yast2 package/yast2.changes
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 16:09:47 2007 New Revision: 38176 URL: http://svn.opensuse.org/viewcvs/yast?rev=38176&view=rev Log: - updated metadata in the sysconfig file (#278612) Modified: trunk/yast2/data/sysconfig.yast2 trunk/yast2/package/yast2.changes Modified: trunk/yast2/data/sysconfig.yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/data/sysconfig.yast2?rev=3… ============================================================================== --- trunk/yast2/data/sysconfig.yast2 (original) +++ trunk/yast2/data/sysconfig.yast2 Tue May 29 16:09:47 2007 @@ -2,21 +2,22 @@ # to over-ride these settins per-user create a # ~/.yast2/yast2 file. -## Path: System/YaST2 +## Path: System/Yast2/GUI +## Description: Default UI for YaST ## Type: list(auto,qt,gtk) -## Description: Default control center for YaST ## Default: "auto" -# selects the control-center implementation to be used -# to render yast widgets -# auto: will attempt to detect both desktop & plugin -# presence and adapt accordingly +# Default control center for YaST +# selects the control-center implementation to be used +# to render yast widgets +# auto: will attempt to detect both desktop & plugin +# presence and adapt accordingly WANTED_SHELL="auto" ## Type: list(auto,qt,gtk,ncurses) -## Description: Default UI backend for YaST ## Default: "auto" -# selects the GUI plugin to be used to render yast widgets -# auto: will attempt to detect both desktop & plugin -# presence and adapt accordingly, falling back to -# qt rendering if gtk is not present +# Default UI backend for YaST +# selects the GUI plugin to be used to render yast widgets +# auto: will attempt to detect both desktop & plugin +# presence and adapt accordingly, falling back to +# qt rendering if gtk is not present WANTED_GUI="auto" Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue May 29 16:09:47 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 29 15:53:15 CEST 2007 - lslezak(a)suse.cz + +- updated metadata in the sysconfig file (#278612) + +------------------------------------------------------------------- Fri May 25 10:59:56 CEST 2007 - jsrain(a)suse.cz - fixed spec file (removed duplicate .desktop files translations) -- 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] r38175 - /tags/stable-2_15_17/ncurses/
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 14:35:07 2007 New Revision: 38175 URL: http://svn.opensuse.org/viewcvs/yast?rev=38175&view=rev Log: Created tag stable-2_15_17 for ncurses Added: tags/stable-2_15_17/ncurses/ - copied from r38174, trunk/ncurses/ -- 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] r38174 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes src/pkg/NCPackageSelector.cc
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 14:34:59 2007 New Revision: 38174 URL: http://svn.opensuse.org/viewcvs/yast?rev=38174&view=rev Log: Version 2.15.17 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/pkg/NCPackageSelector.cc Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=38174&r1=381… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue May 29 14:34:59 2007 @@ -1 +1 @@ -2.15.16 +2.15.17 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 Tue May 29 14:34:59 2007 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue May 29 13:03:07 CEST 2007 - kmachalkova(a)suse.cz + +- Removed obsolete save/load selection stuff + related NCPkgPopupFile + class - replaced by save/load pkgs & patterns (FaTE #300729) +- Improved usability of cancel dialog in pkg manager (#274774) +- Fix disappearing 'Etc./All Packages List' submenu after unchecking + AutoDependency Check +- Place all popup dialogs in pkg manager to the centre of the screen + and calculate their size relatively to the screen size (if applicable) + (#275610) +- 2.15.17 + +------------------------------------------------------------------- Wed May 23 13:54:16 CEST 2007 - gs(a)suse.de - Package Installation: check the partition size to prevent Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Tue May 29 14:34:59 2007 @@ -2386,7 +2386,7 @@ bool ok = true; string pkgName = slbPtr->name(); - NCPopupInfo info( wpos( NCurses::lines()/10, (NCurses::cols()/10), + NCPopupInfo info( wpos( NCurses::lines()/10, NCurses::cols()/10), NCPkgNames::NotifyLabel(), YCPString( "" + pkgName + " " + createDescrText( licenseText ) ), NCPkgNames::AcceptLabel(), -- 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] r38173 - /tags/branch-SLE-10-SP1-2_13_2/product-creator/
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 14:18:55 2007 New Revision: 38173 URL: http://svn.opensuse.org/viewcvs/yast?rev=38173&view=rev Log: Created tag branch-SLE-10-SP1-2_13_2 for product-creator Added: tags/branch-SLE-10-SP1-2_13_2/product-creator/ - copied from r38172, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r38172 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 14:18:43 2007 New Revision: 38172 URL: http://svn.opensuse.org/viewcvs/yast?rev=38172&view=rev Log: - 2.13.2 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Tue May 29 14:18:43 2007 @@ -1 +1 @@ -2.13.1 +2.13.2 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Tue May 29 14:18:43 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue May 29 14:18:19 CEST 2007 - lslezak(a)suse.cz + +- 2.13.2 + +------------------------------------------------------------------- Mon May 28 15:59:55 CEST 2007 - lslezak(a)suse.cz - reinitialize the package manager before creating another image -- 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] r38171 - /tags/stable-2_15_37/network/
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 12:58:24 2007 New Revision: 38171 URL: http://svn.opensuse.org/viewcvs/yast?rev=38171&view=rev Log: Created tag stable-2_15_37 for network Added: tags/stable-2_15_37/network/ - copied from r38170, trunk/network/ -- 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] r38170 - in /trunk/network: VERSION package/yast2-network.changes src/modules/DSL.ycp src/modules/ISDN.ycp src/modules/Lan.ycp src/modules/Modem.ycp
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 12:58:19 2007 New Revision: 38170 URL: http://svn.opensuse.org/viewcvs/yast?rev=38170&view=rev Log: add Confirm::MustBeRoot to all network modules (#276478) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/DSL.ycp trunk/network/src/modules/ISDN.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/Modem.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38170&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue May 29 12:58:19 2007 @@ -1 +1 @@ -2.15.36 +2.15.37 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue May 29 12:58:19 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 12:56:38 CEST 2007 - mzugec(a)suse.cz + +- add Confirm::MustBeRoot to all network modules (#276478) +- 2.15.37 + +------------------------------------------------------------------- Tue May 29 09:03:20 CEST 2007 - mzugec(a)suse.cz - improve add/edit device dialogs (device type) Modified: trunk/network/src/modules/DSL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DSL.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DSL.ycp (original) +++ trunk/network/src/modules/DSL.ycp Tue May 29 12:58:19 2007 @@ -154,6 +154,10 @@ ], [], ""); if(Abort()) return false; + + // check the environment + if(!Confirm::MustBeRoot()) return false; + /* Progress step 1/5 */ ProgressNextStage(_("Detecting DSL devices...")); if(!Detection::running) Detection::Start(); Modified: trunk/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/ISDN.ycp?rev… ============================================================================== --- trunk/network/src/modules/ISDN.ycp (original) +++ trunk/network/src/modules/ISDN.ycp Tue May 29 12:58:19 2007 @@ -277,6 +277,10 @@ Devices = $[]; if(Abort()) return false; + + // check the environment + if(!Confirm::MustBeRoot()) return false; + // step 1 in reading current ISDN setup ProgressNextStage(_("Detecting ISDN cards...")); Hardware = ReadHardware("isdn"); Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Tue May 29 12:58:19 2007 @@ -380,6 +380,11 @@ ], [], ""); if(Abort()) return false; + + // check the environment + if(!Confirm::MustBeRoot()) return false; + + /* Progress step 1/9 */ ProgressNextStage(_("Detecting network devices...")); // if(!Arch::s390 ()) /* FIXME: Temporary hack until the detection is functional */ Modified: trunk/network/src/modules/Modem.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Modem.ycp?re… ============================================================================== --- trunk/network/src/modules/Modem.ycp (original) +++ trunk/network/src/modules/Modem.ycp Tue May 29 12:58:19 2007 @@ -128,6 +128,11 @@ ], [], ""); if(Abort()) return false; + + // check the environment + if(!Confirm::MustBeRoot()) return false; + + /* Progress step 1/4 */ ProgressNextStage(_("Detecting modems...")); Hardware = ReadHardware("modem"); -- 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] r38169 - /tags/stable-2_15_20/pkg-bindings/
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 12:55:31 2007 New Revision: 38169 URL: http://svn.opensuse.org/viewcvs/yast?rev=38169&view=rev Log: Created tag stable-2_15_20 for pkg-bindings Added: tags/stable-2_15_20/pkg-bindings/ - copied from r38168, 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] r38168 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Callbacks.cc src/Selection.cc
by lslezak＠svn.opensuse.org 29 May '07

29 May '07

Author: lslezak Date: Tue May 29 12:55:20 2007 New Revision: 38168 URL: http://svn.opensuse.org/viewcvs/yast?rev=38168&view=rev Log: - updated GPG callbacks (#277117) - improved logging (found by build check) - 2.15.20 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Callbacks.cc trunk/pkg-bindings/src/Selection.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=38168&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Tue May 29 12:55:20 2007 @@ -1 +1 @@ -2.15.19 +2.15.20 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 Tue May 29 12:55:20 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 11:20:43 CEST 2007 - lslezak(a)suse.cz + +- updated GPG callbacks (#277117) +- 2.15.20 + +------------------------------------------------------------------- Thu May 17 15:35:54 CEST 2007 - lslezak(a)suse.cz - Evaluate start/finish callbacks in Pkg::SourceRestore() and Modified: trunk/pkg-bindings/src/Callbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Callbacks.cc (original) +++ trunk/pkg-bindings/src/Callbacks.cc Tue May 29 12:55:20 2007 @@ -1590,7 +1590,7 @@ { KeyRingSignal ( RecipientCtl & construct_r ) : Recipient( construct_r ) {} - virtual void trustedKeyAdded( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key ) + virtual void trustedKeyAdded( const zypp::PublicKey &key ) { CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyAdded) ); @@ -1602,7 +1602,7 @@ } } - virtual void trustedKeyRemoved( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key ) + virtual void trustedKeyRemoved( const zypp::PublicKey &key ) { CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyRemoved) ); Modified: trunk/pkg-bindings/src/Selection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Selection.cc?re… ============================================================================== --- trunk/pkg-bindings/src/Selection.cc (original) +++ trunk/pkg-bindings/src/Selection.cc Tue May 29 12:55:20 2007 @@ -117,7 +117,7 @@ } else { - y2warning (string ("Unknown status in Pkg::GetSelections(" + status + ", ...)").c_str()); + y2warning("Unknown status in Pkg::GetSelections(%s, ...)", status.c_str()); break; } @@ -218,7 +218,7 @@ } else { - y2warning (string ("Unknown status in Pkg::GetPatterns(" + status + ", ...)").c_str()); + y2warning("Unknown status in Pkg::GetPatterns(%s, ...)", status.c_str()); 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] r38167 - in /trunk/ncurses/src: NCDialog.cc pkg/NCPackageSelector.cc pkg/NCPkgPopupDeps.cc
by kmachalkova＠svn.opensuse.org 29 May '07

29 May '07

Author: kmachalkova Date: Tue May 29 12:14:34 2007 New Revision: 38167 URL: http://svn.opensuse.org/viewcvs/yast?rev=38167&view=rev Log: Place all popup dialogs in pkg manager to the centre of the screen and calculate their size relatively to the screen size (if applicable) (#275610) Modified: trunk/ncurses/src/NCDialog.cc trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Modified: trunk/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.cc?rev=3816… ============================================================================== --- trunk/ncurses/src/NCDialog.cc (original) +++ trunk/ncurses/src/NCDialog.cc Tue May 29 12:14:34 2007 @@ -1195,7 +1195,7 @@ helpIntro = _( "Press F1 or ESC to close this dialog." ); } - helpPopup = new NCPopupInfo( wpos(1,1), + helpPopup = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/3 ), // headline of the text mode help _( "Text Mode Navigation" ), YCPString( helpIntro + @@ -1203,6 +1203,8 @@ helpText ), "" ); + helpPopup->setNiceSize( NCurses::cols()/3, NCurses::lines()/3 ); + } if ( helpPopup ) { Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Tue May 29 12:14:34 2007 @@ -228,10 +228,10 @@ searchPopup = new NCPkgPopupSearch( wpos( 1, 1 ), this ); // the dependency popup - depsPopup = new NCPkgPopupDeps( wpos( 1, 1 ), this ); + depsPopup = new NCPkgPopupDeps( wpos( 3, 8 ), this ); // the disk space popup - diskspacePopup = new NCPkgPopupDiskspace( wpos( 1, 1 ), testMode ); + diskspacePopup = new NCPkgPopupDiskspace( wpos( (NCurses::lines() - 15)/2, NCurses::cols()/6 ), testMode ); } @@ -1551,10 +1551,10 @@ return false; } - NCPopupInfo info( wpos(10, 10), YCPString( "" ), + NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), YCPString( "" ), YCPString(_( "All package dependencies are OK." )), NCPkgNames::OKLabel() ); - info.setNiceSize( 30, 5 ); + info.setNiceSize( 35, 5 ); if ( event.selection->compare( NCPkgNames::ShowDeps() ) == YO_EQUAL ) { @@ -1955,7 +1955,7 @@ if ( success ) { - NCPopupInfo info( wpos( 1, 1 ), + NCPopupInfo info( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-40)/2 ), YCPString( "" ), YCPString( _("Dependency resolver test case written to ") + " " + testCaseDir ) ); info.setNiceSize( 40, 8 ); @@ -2014,11 +2014,12 @@ (void) unlink( filename->asString()->value_cstr() ); //present error popup to the user - NCPopupInfo errorMsg ( wpos( 2, 2 ), + NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ), YCPString( NCPkgNames::ErrorLabel()), YCPString( _("Error exporting list of packages and patterns to ") + filename->toString() ), NCPkgNames::OKLabel(), ""); + errorMsg.setNiceSize(40,5); NCursesEvent input = errorMsg.showInfoPopup(); } @@ -2096,11 +2097,12 @@ { NCWAR << "Error importing list of packages and patterns from" << filename->toString() << endl; - NCPopupInfo errorMsg ( wpos( 2, 2 ), + NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) , YCPString( NCPkgNames::ErrorLabel()), YCPString( _("Error importing list of packages and patterns from ") + filename->toString() ), NCPkgNames::OKLabel(), ""); + errorMsg.setNiceSize(40,5); NCursesEvent input = errorMsg.showInfoPopup(); } @@ -2157,7 +2159,7 @@ } // open the popup with the help text - NCPopupInfo pkgHelp( wpos( 1, 1 ), headline, YCPString( text ) ); + NCPopupInfo pkgHelp( wpos( (NCurses::lines()*8)/100, (NCurses::cols()*18)/100 ), headline, YCPString( text ) ); pkgHelp.setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); pkgHelp.showInfoPopup( ); @@ -2185,7 +2187,8 @@ text += NCPkgNames::YouHelp3(); // open the popup with the help text - NCPopupInfo youHelp( wpos( 1, 1 ), YCPString(NCPkgNames::YouHelp()), YCPString(text) ); + NCPopupInfo youHelp( wpos( NCurses::lines()/3, NCurses::cols()/6 ), YCPString(NCPkgNames::YouHelp()), YCPString(text) ); + youHelp.setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 ); youHelp.showInfoPopup( ); if ( packageList ) @@ -2208,7 +2211,7 @@ if (changes) { // show a popup and ask the user - NCPopupInfo cancelMsg( wpos( 2, 2 ), + NCPopupInfo cancelMsg( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-45)/2 ), YCPString( NCPkgNames::NotifyLabel() ), YCPString( NCPkgNames::CancelText() ), NCPkgNames::YesLabel(), @@ -2259,7 +2262,7 @@ if ( !youMode ) // don't show automatic changes if YOU mode { // show the automatic changes list - NCPkgPopupTable autoChangePopup( wpos( 1, 1), this ); + NCPkgPopupTable autoChangePopup( wpos( 3, 8), this ); NCursesEvent input = autoChangePopup.showInfoPopup(); if ( input == NCursesEvent::cancel ) @@ -2276,7 +2279,7 @@ if ( message != "" ) { // open the popup e.g. with the text "/usr needs 50 MB more disk space" - NCPopupInfo spaceMsg( wpos( 2, 2 ), + NCPopupInfo spaceMsg( wpos( (NCurses::lines()-10)/2, (NCurses::cols()-50)/2 ), YCPString( NCPkgNames::ErrorLabel() ), YCPString( NCPkgNames::DiskSpaceError() + " " + message ), NCPkgNames::OKLabel(), @@ -2383,11 +2386,12 @@ bool ok = true; string pkgName = slbPtr->name(); - NCPopupInfo info( wpos( 1, 1), + NCPopupInfo info( wpos( NCurses::lines()/10, (NCurses::cols()/10), NCPkgNames::NotifyLabel(), YCPString( "" + pkgName + " " + createDescrText( licenseText ) ), NCPkgNames::AcceptLabel(), NCPkgNames::CancelLabel() ); + info.setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; @@ -2527,7 +2531,7 @@ bool ok = false; bool cancel = false; - NCPopupInfo info( wpos(10, 10), YCPString( "" ), + NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), YCPString( "" ), YCPString(_( "System dependencies verify OK." )), NCPkgNames::OKLabel() ); info.setNiceSize( 30, 5 ); @@ -2540,7 +2544,7 @@ //call the solver (with S_Verify it displays no popup) cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); //display the popup with automatic changes - NCPkgPopupTable autoChangePopup( wpos( 1, 1), this ); + NCPkgPopupTable autoChangePopup( wpos( 3, 8 ), this ); NCursesEvent input = autoChangePopup.showInfoPopup(); if ( input == NCursesEvent::cancel ) Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDeps.c… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Tue May 29 12:14:34 2007 @@ -230,7 +230,7 @@ NCDBG << "Solving..." << endl ; - NCPopupInfo info( wpos(10, 10), YCPString( "" ), + NCPopupInfo info( wpos( (NCurses::lines()-4)/2, (NCurses::cols()-18)/2), YCPString( "" ), YCPString(NCPkgNames::Solving()), NCPkgNames::OKLabel() ); info.setNiceSize( 18, 4 ); -- 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] r38166 - /tags/stable-2_15_4/http-server/
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:10:06 2007 New Revision: 38166 URL: http://svn.opensuse.org/viewcvs/yast?rev=38166&view=rev Log: Created tag stable-2_15_4 for http-server Added: tags/stable-2_15_4/http-server/ - copied from r38165, trunk/http-server/ -- 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] r38165 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/HttpServerWidgets.ycp src/dialogs.ycp src/wizards.ycp
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:08:50 2007 New Revision: 38165 URL: http://svn.opensuse.org/viewcvs/yast?rev=38165&view=rev Log: improved workflow dialogs (host/hosts) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServerWidgets.ycp trunk/http-server/src/dialogs.ycp trunk/http-server/src/wizards.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=38165&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Tue May 29 09:08:50 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Tue May 29 09:08:50 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 09:08:05 CEST 2007 - mzugec(a)suse.cz + +- improved workflow dialogs (host/hosts) +- 2.15.4 + +------------------------------------------------------------------- Fri May 11 14:26:47 CEST 2007 - mzugec(a)suse.cz - validation for VhostID when create new virtual host (#245155) Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidget… ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Tue May 29 09:08:50 2007 @@ -202,7 +202,6 @@ // skip ourself also when this is main server if (( host == hostid ) || (hostid == "main")) continue; if (host == "main") continue; -// list< map<string,any> > desc = YaST::HTTPDData::GetHost (host); // find out the server name string value = (string)get_host_value ( "ServerName", YaST::HTTPDData::GetHost (host), nil ); if (value == servername) @@ -214,7 +213,6 @@ break; } -// value = (string)get_host_value ("HostIP", desc, nil); map<string, any> vhost = YaST::HTTPDData::GetVhostType(host); if (! FileUtils::CheckAndCreatePath( documentroot )){ @@ -319,12 +317,6 @@ ]); return nil; } -//symbol showAccessLogPopup (any key, map event); -//symbol showErrorLogPopup (any key, map event); - -//list <string> host_ids = nil; - -//void OverviewInit (string widget) { } /** * Handle overview (listen) widget @@ -636,8 +628,6 @@ global void storeServiceStatus (string key, map event); global void initAdaptFirewall (string key); global void storeAdaptFirewall (string opt_id, map event); -//global void DirectoryOptionInit (any key, string id); -//global void DirectoryOptionStore (any key, string id); // wizard widget functions global void initOpenPort (string key); @@ -647,10 +637,9 @@ global boolean validateListenInterfaces(string key, map event); global void initFwOpen (string key); global void storeFwOpen (string opt_id, map event); -//void initExpertConf (string key); global symbol handleExpertConf (string key, map event); void initScriptModules(string key); -void initSummaryText(string key); +void initSummaryText(string key); global symbol handleBooting (string key, map event); global map getHostOptions(boolean is_main_server); boolean getServiceAutoStart(); @@ -677,8 +666,6 @@ // table cell description "label" : _("Server Name"), "widget" : `textentry, -// "validate_type" : `function, -// "validate_function" : validate_servername, ], ], "DocumentRoot" : $[ Modified: trunk/http-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/http-server/src/dialogs.ycp (original) +++ trunk/http-server/src/dialogs.ycp Tue May 29 09:08:50 2007 @@ -257,7 +257,7 @@ // translators: dialog caption, %1 is the host name string caption = sformat( _("SSL Configuration for '%1'"), // translators: human-readable "default host" - HttpServerWidgets::currenthost == "defaulthost" ? _("Default Host") + HttpServerWidgets::currenthost == "main" ? _("Default Host") : HttpServerWidgets::get_host_value ( "ServerName" , YaST::HTTPDData::GetHost(HttpServerWidgets::currenthost), HttpServerWidgets::currenthost ) ); Modified: trunk/http-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/http-server/src/wizards.ycp (original) +++ trunk/http-server/src/wizards.ycp Tue May 29 09:08:50 2007 @@ -20,45 +20,24 @@ include "http-server/dialogs.ycp"; include "http-server/wizard-dialog.ycp"; +define symbol MainSequence(); -/** - * Main workflow of the http-server configuration - * @return sequence result - */ -symbol MainSequence() { +symbol VirtualHostSequence(string action){ map aliases = $[ - "overview" : ``( OverviewDialog() ), "host" : ``( HostDialog() ), - "main-host" : ``( HostDialog() ), // different workflow "addhost" : ``( AddHost() ), "setvhost" : ``( SetVHostOptions() ), "ssl" : ``( SSLDialog () ), "dir" : ``( DirDialog () ), - "ssl-default" : ``( SSLDialog () ), ]; + string def = (action=="add")?"addhost":"host"; map sequence = $[ - "ws_start" : "overview", - "overview" : $[ - `abort : `abort, - `next : `next, - `default : "main-host", -// `hosts : "hosts", - `dir : "dir", - `ssl : "ssl-default", - `edit : "host", - `add : "addhost", - ], - "ssl-default" : $[ - `abort : `abort, - `next : "main-host", - `back : "main-host", - ], + "ws_start" : def, "host" : $[ `abort : `abort, - `next : "overview", -// `back : "hosts", + `next : `next, //"overview", `ssl : "ssl", `dir : "dir" ], @@ -66,11 +45,10 @@ "addhost": $[ `abort : `abort, `next : "setvhost", -// `back : "hosts", ], "setvhost": $[ `abort : `abort, - `next : "overview", + `next : `next, //"overview", `back : "addhost" ], "ssl": $[ @@ -85,6 +63,51 @@ ] ]; + return Sequencer::Run(aliases, sequence); +} + +/** + * Main workflow of the http-server configuration + * @return sequence result + */ +symbol MainSequence() { + + map aliases = $[ + "overview" : ``( OverviewDialog() ), + "addhost" : ``( AddHost() ), + "setvhost" : ``( SetVHostOptions() ), + "dir" : ``( DirDialog () ), + "add-vh" : [ ``( VirtualHostSequence("add")), true ], + "edit-vh" : [ ``( VirtualHostSequence("edit")), true ] + ]; + + map sequence = $[ + "ws_start" : "overview", + "overview" : $[ + `abort : `abort, + `next : `next, + `dir : "dir", + `edit : "edit-vh", + `add : "add-vh", + ], + "add-vh" : $[ + `next : "overview" //`next + ], + "edit-vh" : $[ + `next : "overview" //`next + ], + "setvhost": $[ + `abort : `abort, + `next : "overview", + `back : "addhost" + ], + "dir": $[ + `abort : `abort, + `next : "overview", + `back : "overview" + ] + ]; + symbol ret = Sequencer::Run(aliases, sequence); return ret; -- 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] r38164 - /tags/stable-2_15_36/network/
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:04:23 2007 New Revision: 38164 URL: http://svn.opensuse.org/viewcvs/yast?rev=38164&view=rev Log: Created tag stable-2_15_36 for network Added: tags/stable-2_15_36/network/ - copied from r38163, trunk/network/ -- 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] r38163 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp src/lan/complex.ycp src/lan/hardware.ycp
by mzugec＠svn.opensuse.org 29 May '07

29 May '07

Author: mzugec Date: Tue May 29 09:04:15 2007 New Revision: 38163 URL: http://svn.opensuse.org/viewcvs/yast?rev=38163&view=rev Log: improve add/edit device dialogs (device type) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp trunk/network/src/lan/complex.ycp trunk/network/src/lan/hardware.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38163&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue May 29 09:04:15 2007 @@ -1 +1 @@ -2.15.35 +2.15.36 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue May 29 09:04:15 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 29 09:03:20 CEST 2007 - mzugec(a)suse.cz + +- improve add/edit device dialogs (device type) +- 2.15.36 + +------------------------------------------------------------------- Mon May 28 17:07:40 CEST 2007 - mzugec(a)suse.cz - disable routing dialog when NetworkManager used (#178538) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Tue May 29 09:04:15 2007 @@ -135,14 +135,11 @@ break; case "none" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `none); break; - - } } symbol handleBootProto (string key, map event) { -// if (event["EventReason"]:"" == "ValueChanged"){ boolean none = false; boolean dynamic = false; boolean stat = false; @@ -157,8 +154,6 @@ UI::ChangeWidget(`dyn, `Enabled, dynamic); UI::ChangeWidget(`ipaddr, `Enabled, stat); UI::ChangeWidget(`netmask, `Enabled, stat); - -// } return nil; } @@ -196,22 +191,13 @@ void initIfcfg (string key) { UI::ChangeWidget(`id(key), `Value, Lan::type); + UI::ChangeWidget(`id(key), `Enabled, false); } void initIfcfgId (string key) { UI::ChangeWidget(`id(key), `Value, Lan::device); } -/** - * Event handler for ifcfg name - * enable or disable depending on whether we are adding a new interface - * @param key the widget receiving the event - * @param event the event being handled - * @return nil so that the dialog loops on - */ -symbol HandleIfcfg (string key, map event) { - UI::ChangeWidget (`id (key), `Enabled, Lan::operation == `add); - return nil; -} + /** * Remap the buttons to their Wizard Sequencer values @@ -300,18 +286,6 @@ } /** - * Initialize the dialog as a whole - * Sets default focus - * @param key id of the widget - */ - -/* -void InitDialog (string key) { - UI::SetFocus (`id ("IPADDR")); -} -*/ - -/** * If the traffic would be blocked, ask the user * if he wants to change it * @param event the event being handled @@ -381,19 +355,6 @@ } /** - * Store values computed from the whole dialog - * @param key the widget being validated - * @param event the event being handled - */ - -/* -void StoreDialog (string key, map event) { - return; -} -*/ - - -/** * Initialize value of firewall zone widget * (disables it when SuSEFirewall is not installed) * @param key id of the widget @@ -410,7 +371,7 @@ "widget" : `custom, "custom_widget" : /* Frame label */ - `Frame(`id(`f_additional), _("Additional Addresses"), `HBox(`HSpacing(3), `VBox( + `Frame(`id(`f_additional), _("Additional Addresses"), `HBox(`HSpacing(3), `VBox( `VSpacing(1), `Table(`id(`table), `opt(`notify), `header( /* Table header label */ @@ -498,7 +459,7 @@ "help": "", // "items" will be filled in the dialog itself "init" : initIfcfg, - "handle": HandleIfcfg, +// "handle": HandleIfcfg, "validate_type": `function, "validate_function": ValidateIfcfgType, ], @@ -511,7 +472,7 @@ "help": "", "init" : initIfcfgId, "valid_chars": NetworkDevices::ValidCharsIfcfg (), - "handle": HandleIfcfg, +// "handle": HandleIfcfg, ], "BONDSLAVE": $[ @@ -883,21 +844,16 @@ "tab_help" : "", "fallback_functions" : functions, ]; - -// if (Lan::operation == `add) wd_content["initial_tab"] = "hardware"; - + hw_standalone=false; wd = (map<string, map<string,any> >) union (wd, $[ "tab" : CWMTab::CreateWidget (wd_content) ]); - term contents2 = `HBox ("tab"); - - any ret = CWM::ShowAndRun ( $[ "widget_names": ["tab"], "widget_descr": wd, - "contents": contents2, + "contents": `HBox ("tab"), /* Address dialog caption */ "caption": _("Network Card Setup"), "back_button" : Label::BackButton (), @@ -905,7 +861,7 @@ "fallback_functions" : functions, ]); y2milestone ("ShowAndRun: %1", ret); - + if (ret != `back && ret != `abort) { string ifcfgname = NetworkDevices::device_name ( Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=… ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Tue May 29 09:04:15 2007 @@ -216,10 +216,8 @@ list<map<string,any> > o_items = nil; void initOverview (string key) ``{ -// if (o_items == nil){ o_items = (list<map<string,any> >)Lan::Overview(); o_items = o_items + Lan::Unconfigured (); -// } list<term> term_items = maplist (map<string,any> i, o_items, { term t = `item (`id (i["id"]:"")); Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev… ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Tue May 29 09:04:15 2007 @@ -61,11 +61,13 @@ _("Options for the module should be written in the format specified in the IBM Device Drivers and Installation Commands manual."); } + map<string, any> hardware = nil; +boolean hw_standalone=false; + void initHwDialog(string text) { hardware = $[]; -// ScreenName("lan-hardware"); /* Manual dialog caption */ string caption = _("Manual Network Card Configuration"); @@ -88,7 +90,7 @@ // #38213, remember device id when we switch back from pcmcia/usb hardware["non_hotplug_device_id"] = hardware["device"]:""; hardware["hwcfg"] = Lan::nm_name; -if (Lan::nm_name=="" && Lan::nm_name_old!=nil) hardware["hwcfg"]=Lan::nm_name_old; + if (Lan::nm_name=="" && Lan::nm_name_old!=nil) hardware["hwcfg"]=Lan::nm_name_old; // FIXME duplicated in address.ycp hardware["device_types"] = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond" ]; @@ -99,10 +101,9 @@ if(Arch::ia64 ()) hardware["device_types"] = add(hardware["device_types"]:[], "xp"); - if(issubstring(hardware["device"]:"", "bus-pcmcia")) - hardware["hotplug"] = "pcmcia"; - else if(issubstring(hardware["device"]:"", "bus-usb")) - hardware["hotplug"] = "usb"; + if(issubstring(hardware["device"]:"", "bus-pcmcia")) hardware["hotplug"] = "pcmcia"; + else if(issubstring(hardware["device"]:"", "bus-usb")) hardware["hotplug"] = "usb"; + y2milestone("hotplug=%1", Lan::hotplug); term CheckBoxes = `HBox( @@ -124,9 +125,6 @@ `HSpacing(1.5) ); - /* Pushbutton label */ - term ListButton = `PushButton(`id(`list), _("Select from &List")); - /* Disable PCMCIA and USB checkboxex on Edit and s390 */ if(Lan::operation == `edit /* FIXME: unique || Lan::unique != "" */ || Arch::s390 () == true) CheckBoxes = `VSpacing(0); @@ -147,6 +145,7 @@ CheckBoxes, `VSpacing(0.4) ),`HSpacing(0.5))); + hardware["devices"] = Lan::FreeDevices(hardware["realtype"]:""); // TODO: id-, bus-, ... here if(!contains(hardware["devices"]:[], hardware["device"]:"")) hardware["devices"] = prepend(hardware["devices"]:[], hardware["device"]:""); @@ -156,7 +155,6 @@ /* Manual dialog contents */ term TypeNameWidgets = -// `Frame(_("Network &Configuration"), `VBox( `VSpacing(0.2), `HBox( @@ -168,8 +166,6 @@ DeviceNumberBox, `HSpacing(0.5) ) -// `VSpacing(0.2) -// ) ); /* Add hardware -> don't allow some changes (card type) */ @@ -201,7 +197,8 @@ term ButtonBox = `HBox( `HStretch(), `HSpacing(0.5), - ListButton, + /* Pushbutton label */ + `PushButton(`id(`list), _("Select from &List")), `HSpacing(0.5), `HStretch() ); @@ -223,6 +220,7 @@ )); UI::ReplaceWidget(`hw_content, contents); + if (Lan::nm_name=="" && Lan::nm_name_old!=nil) UI::ChangeWidget(`enable_hwconfig, `Value, false); hardware["no_hotplug"] = hardware["hotplug"]:"" == ""; hardware["no_hotplug_dummy"] = hardware["no_hotplug"]:false && hardware["type"]:"" != "dummy"; @@ -232,7 +230,7 @@ ChangeWidgetIfExists(`id(`hwcfg), `Enabled, hardware["no_hotplug"]:false); ChangeWidgetIfExists(`id(`usb), `Enabled, (hardware["hotplug"]:"" == "usb" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); ChangeWidgetIfExists(`id(`pcmcia), `Enabled, (hardware["hotplug"]:"" == "pcmcia" || hardware["hotplug"]:"" == "") && hardware["type"]:"" != "dummy"); - + if (!hw_standalone) ChangeWidgetIfExists(`id(`dev), `Enabled,false); ChangeWidgetIfExists(`id(`num), `ValidChars, NetworkDevices::ValidCharsIfcfg ()); ChangeWidgetIfExists(`id(`hwcfg), `ValidChars, NetworkModules::ValidCharsHwcfg ()); } @@ -723,6 +721,7 @@ any HardwareDialog (){ string caption = _("Hardware Dialog"); + hw_standalone = true; list<map <string, any> > w = CWM::CreateWidgets (["HWDIALOG"], (map <string, map <string, any> >) widget_descr_hardware); term contents = `VBox( -- 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] r38162 - /tags/stable-2_15_35/network/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 17:09:24 2007 New Revision: 38162 URL: http://svn.opensuse.org/viewcvs/yast?rev=38162&view=rev Log: Created tag stable-2_15_35 for network Added: tags/stable-2_15_35/network/ - copied from r38161, trunk/network/ -- 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] r38161 - in /trunk/network: VERSION package/yast2-network.changes src/services/routing.ycp
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 17:09:18 2007 New Revision: 38161 URL: http://svn.opensuse.org/viewcvs/yast?rev=38161&view=rev Log: disable routing dialog when NetworkManager used (#178538) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/services/routing.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38161&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 28 17:09:18 2007 @@ -1 +1 @@ -2.15.34 +2.15.35 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 28 17:09:18 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 28 17:07:40 CEST 2007 - mzugec(a)suse.cz + +- disable routing dialog when NetworkManager used (#178538) +- 2.15.35 + +------------------------------------------------------------------- Mon May 28 10:20:08 CEST 2007 - mzugec(a)suse.cz - installation network changes: Modified: trunk/network/src/services/routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/routing.ycp… ============================================================================== --- trunk/network/src/services/routing.ycp (original) +++ trunk/network/src/services/routing.ycp Mon May 28 17:09:18 2007 @@ -22,6 +22,7 @@ import "Lan"; import "CWM"; import "CWMTab"; +import "NetworkService"; include "network/lan/help.ycp"; include "network/routines.ycp"; @@ -58,7 +59,7 @@ )); if(entry[4]:"" != "") - UI::ChangeWidget(`id(`device), `Value, entry[4]:""); + UI::ChangeWidget(`id(`device), `Value, entry[4]:""); UI::ChangeWidget(`id(`destination), `ValidChars, IP::ValidChars + "default" + "/-"); UI::ChangeWidget(`id(`gateway), `ValidChars, IP::ValidChars + "-"); UI::ChangeWidget(`id(`netmask), `ValidChars, Netmask::ValidChars + "-"); @@ -165,6 +166,15 @@ UI::ChangeWidget(`id(`add), `Enabled, false); UI::SetFocus(`id(`gw)); + // #178538 - disable routing dialog when NetworkManager is used + boolean enabled = !(boolean)NetworkService::IsManaged(); + + UI::ChangeWidget(`id(`gw), `Enabled, enabled); + UI::ChangeWidget(`id(`table), `Enabled, enabled); + UI::ChangeWidget(`id(`forward), `Enabled, enabled); + UI::ChangeWidget(`id(`add), `Enabled, enabled); + UI::ChangeWidget(`id(`expert), `Enabled, enabled); + // fixed bug #73739 - if dhcp is used, dont set default gw statically // if (Lan::bootproto == "dhcp")UI::ChangeWidget(`id(`gw),`Enabled, false); } -- 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] r38160 - in /trunk/installation: control/control.SLD.xml control/control.SLES.xml control/examples/custom.xml control/tests/test.xml package/yast2-installation.changes
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 16:03:18 2007 New Revision: 38160 URL: http://svn.opensuse.org/viewcvs/yast?rev=38160&view=rev Log: removed netsetup item from control files Modified: trunk/installation/control/control.SLD.xml trunk/installation/control/control.SLES.xml trunk/installation/control/examples/custom.xml trunk/installation/control/tests/test.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLD.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLD… ============================================================================== --- trunk/installation/control/control.SLD.xml (original) +++ trunk/installation/control/control.SLD.xml Mon May 28 16:03:18 2007 @@ -538,10 +538,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -629,12 +625,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -787,10 +777,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Mon May 28 16:03:18 2007 @@ -661,10 +661,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -752,12 +748,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -915,10 +905,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/examples/custom.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/cu… ============================================================================== --- trunk/installation/control/examples/custom.xml (original) +++ trunk/installation/control/examples/custom.xml Mon May 28 16:03:18 2007 @@ -378,19 +378,10 @@ </defaults> <modules config:type="list"> <module> - <name>netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>rpmcopy</name> </module> <module> <label>Network</label> - <name>netsetup</name> - <arguments>false,false,`dn</arguments> - </module> - <module> - <label>Network</label> <name>proposal</name> <arguments>true,true,`net</arguments> </module> @@ -435,10 +426,6 @@ </defaults> <modules config:type="list"> <module> - <name>netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>netprobe</name> </module> <module> @@ -561,10 +548,6 @@ <mode>autoinst</mode> <modules config:type="list"> <module> - <name>netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/tests/test.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/tests/test.… ============================================================================== --- trunk/installation/control/tests/test.xml (original) +++ trunk/installation/control/tests/test.xml Mon May 28 16:03:18 2007 @@ -316,9 +316,6 @@ </defaults> <modules config:type="list"> <module> - <name>netsetup</name> - </module> - <module> <name>rpmcopy</name> </module> <module> @@ -368,10 +365,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> @@ -497,9 +490,6 @@ <mode>autoinstallation</mode> <modules config:type="list"> <module> - <name>netsetup</name> - </module> - <module> <name>netprobe</name> </module> <module> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon May 28 16:03:18 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 28 16:02:38 CEST 2007 - mzugec(a)suse.cz + +- removed netsetup item from control files + +------------------------------------------------------------------- Mon May 28 13:33:08 CEST 2007 - mzugec(a)suse.cz - removed inst_netsetup item from control files -- 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] r38159 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 16:01:34 2007 New Revision: 38159 URL: http://svn.opensuse.org/viewcvs/yast?rev=38159&view=rev Log: - reinitialize the package manager before creating another image Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon May 28 16:01:34 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 28 15:59:55 CEST 2007 - lslezak(a)suse.cz + +- reinitialize the package manager before creating another image + +------------------------------------------------------------------- Mon May 28 09:01:06 CEST 2007 - lslezak(a)suse.cz - install "yast2-instserver" package (.content_file agent) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Mon May 28 16:01:34 2007 @@ -93,6 +93,9 @@ // What we want to create with kiwi global string kiwi_task = "iso"; +// original source configuration, needed to reset the package manager +list<map<string,any> > original_config = nil; + /** * Data was modified? * @return true if modified @@ -287,6 +290,11 @@ } }); + if (id == -1) + { + y2error("Source %1 not found!", url); + } + return id; }); @@ -1815,6 +1823,19 @@ global define void enableSources()``{ + // TODO FIXME: use better way to reset the source config in the package manager + if (original_config != nil) + { + y2milestone("Restoring original config: %1", original_config); + Pkg::SourceEditSet(original_config); + Pkg::SourceFinishAll(); + } + else + { + original_config = Pkg::SourceEditGet(); + y2milestone("Current source configuration: %1", original_config); + } + Pkg::SourceStartManager(false); y2milestone("sources: %1", ProductCreator::Config["sources"]:[]); -- 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] r38158 - in /trunk/installation: control/examples/control_default.xml control/examples/control_flex_part.xml control/examples/control_with_liveeval.xml package/yast2-installation.changes
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 13:33:51 2007 New Revision: 38158 URL: http://svn.opensuse.org/viewcvs/yast?rev=38158&view=rev Log: removed inst_netsetup item from control files Modified: trunk/installation/control/examples/control_default.xml trunk/installation/control/examples/control_flex_part.xml trunk/installation/control/examples/control_with_liveeval.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/examples/control_default.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/co… ============================================================================== --- trunk/installation/control/examples/control_default.xml (original) +++ trunk/installation/control/examples/control_default.xml Mon May 28 13:33:51 2007 @@ -173,10 +173,6 @@ </defaults> <modules config:type="list"> <module> - <name>inst_netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>inst_netprobe</name> </module> <module> @@ -266,9 +262,6 @@ <mode>autoinst</mode> <modules config:type="list"> <module> - <name>inst_netsetup</name> - </module> - <module> <name>inst_netprobe</name> </module> <module> Modified: trunk/installation/control/examples/control_flex_part.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/co… ============================================================================== --- trunk/installation/control/examples/control_flex_part.xml (original) +++ trunk/installation/control/examples/control_flex_part.xml Mon May 28 13:33:51 2007 @@ -201,10 +201,6 @@ </defaults> <modules config:type="list"> <module> - <name>inst_netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>inst_netprobe</name> </module> <module> @@ -294,9 +290,6 @@ <mode>autoinst</mode> <modules config:type="list"> <module> - <name>inst_netsetup</name> - </module> - <module> <name>inst_netprobe</name> </module> <module> Modified: trunk/installation/control/examples/control_with_liveeval.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/co… ============================================================================== --- trunk/installation/control/examples/control_with_liveeval.xml (original) +++ trunk/installation/control/examples/control_with_liveeval.xml Mon May 28 13:33:51 2007 @@ -186,10 +186,6 @@ <name>continue</name> <modules config:type="list"> <module> - <name>inst_netsetup</name> - <arguments>false,false,`up</arguments> - </module> - <module> <name>inst_netprobe</name> </module> <module> @@ -282,9 +278,6 @@ <name>continue</name> <modules config:type="list"> <module> - <name>inst_netsetup</name> - </module> - <module> <name>inst_netprobe</name> </module> <module> @@ -330,9 +323,6 @@ <name>inst_finish</name> </module> <module> - <name>inst_netsetup</name> - </module> - <module> <name>inst_netprobe</name> </module> <module> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon May 28 13:33:51 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 28 13:33:08 CEST 2007 - mzugec(a)suse.cz + +- removed inst_netsetup item from control files + +------------------------------------------------------------------- Sun May 27 14:49:37 CEST 2007 - mzugec(a)suse.de - installation network changes: -- 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] r38157 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: package/yast2-product-creator.changes scripts/y2mkiso src/ProductCreator.ycp src/complex.ycp src/wizards.ycp
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 11:11:35 2007 New Revision: 38157 URL: http://svn.opensuse.org/viewcvs/yast?rev=38157&view=rev Log: - install "yast2-instserver" package (.content_file agent) - fixed signing of addon products - allow spaces in the file names (#275918) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon May 28 11:11:35 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 28 09:01:06 CEST 2007 - lslezak(a)suse.cz + +- install "yast2-instserver" package (.content_file agent) +- fixed signing of addon products +- allow spaces in the file names (#275918) + +------------------------------------------------------------------- Wed May 23 15:59:07 CEST 2007 - lslezak(a)suse.cz - 2.13.1 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso Mon May 28 11:11:35 2007 @@ -55,7 +55,7 @@ fi # set it later in pmac branch PPC_HFS_APPID="" -if [ -f $SOURCE/content ] ; then +if [ -f "$SOURCE/content" ] ; then BOOT_BASE_DIR=boot BOOT_IMAGE=$BOOT_BASE_DIR/image BOOT_ISOLINUX=$BOOT_BASE_DIR/$BOOT_ARCH/loader @@ -85,18 +85,18 @@ esac ;; esac - done < $SOURCE/content + done < "$SOURCE/content" DISTVERSION=`echo $DISTVERSION | tr '-' '#'` DISTIDENT="$DISTPRODUCT-$DISTVERSION" - for i in $SOURCE/media.? ; do - test -d $i || continue + for i in "$SOURCE/media.?" ; do + test -d "$i" || continue { read VENDOR read CREATIONDATE - } < $i/media + } < "$i"/media done else - if [ -d $SOURCE/boot/$BOOT_ARCH/loader -a -d $SOURCE/i386/update ]; then + if [ -d "$SOURCE/boot/$BOOT_ARCH/loader" -a -d "$SOURCE/i386/update" ]; then # We have a bootable Patch-CD BOOT_BASE_DIR=boot BOOT_IMAGE=$BOOT_BASE_DIR/image @@ -105,30 +105,30 @@ fi -TMP_LS=`/bin/ls -d $SOURCE/*/update 2> /dev/null` -if [ -d $SOURCE/$BOOT_BASE_DIR -o -d $SOURCE/$ROOT_ON_CD -o ! -z "$TMP_LS" ] ; then +TMP_LS=`/bin/ls -d "$SOURCE/*/update" 2> /dev/null` +if [ -d "$SOURCE/$BOOT_BASE_DIR" -o -d "$SOURCE/$ROOT_ON_CD" -o ! -z "$TMP_LS" ] ; then - if test -e $SOURCE/$ROOT_ON_CD/inst-sys-test ; then + if test -e "$SOURCE/$ROOT_ON_CD/inst-sys-test" ; then echo $SOURCE/$ROOT_ON_CD/inst-sys-test exist. Please remove it. exit fi - if test -f $SOURCE/$BOOT_IMAGE -o -f $SOURCE/.boot \ - -o -d $SOURCE/$BOOT_ISOLINUX \ - -o -f $SOURCE/ppc/bootinfo.txt -o -d $SOURCE/suseboot \ - -o -d $SOURCE/etc -o -f $SOURCE/boot/silo.conf ; then + if test -f "$SOURCE/$BOOT_IMAGE" -o -f "$SOURCE/.boot" \ + -o -d "$SOURCE/$BOOT_ISOLINUX" \ + -o -f "$SOURCE/ppc/bootinfo.txt" -o -d "$SOURCE/suseboot" \ + -o -d "$SOURCE/etc" -o -f "$SOURCE/boot/silo.conf" ; then #test -d $SOURCE2 && { echo "tmpdir $SOURCE2 already exists" ; exit 1 ; } mkdir -p $SOURCE2 || { echo "can't create tmpdir $SOURCE2" ; exit 1 ; } - chmod 755 $SOURCE2 - if [ -f $SOURCE/.boot ] ; then + chmod 755 "$SOURCE2" + if [ -f "$SOURCE/.boot" ] ; then PARAMS="$PARAMS -b .boot -c boot.catalog" echo found boot image. Making CD bootable. - mkdir -p $SOURCE2/$BOOT_BASE_DIR || exit 1 - elif [ -f $SOURCE/$BOOT_IMAGE ] ; then + mkdir -p "$SOURCE2/$BOOT_BASE_DIR" || exit 1 + elif [ -f "$SOURCE/$BOOT_IMAGE" ] ; then # needed for ia64 - xx=`filesize $SOURCE/$BOOT_IMAGE` + xx=`filesize "$SOURCE/$BOOT_IMAGE"` if [ $ "$xx" -ne 1474560 $ -a $ "$xx" -ne 2949120 $ ] ; then - if head -c 200 $SOURCE/$BOOT_IMAGE | grep -a -q 'Sorry, didn.t find boot loader, stopped.' ; then + if head -c 200 "$SOURCE/$BOOT_IMAGE" | grep -a -q 'Sorry, didn.t find boot loader, stopped.' ; then PARAMS="$PARAMS -hard-disk-boot" else PARAMS="$PARAMS -no-emul-boot" @@ -139,12 +139,12 @@ PARAMS="$PARAMS -sort $SORTFILE -b $BOOT_IMAGE -c $BOOT_BASE_DIR/boot.catalog \ -hide $BOOT_BASE_DIR/boot.catalog -hide-joliet $BOOT_BASE_DIR/boot.catalog" echo found boot image. Making CD bootable. - mkdir -p $SOURCE2/$BOOT_BASE_DIR || exit 1 - elif [ -d $SOURCE/$BOOT_ISOLINUX ] ; then + mkdir -p "$SOURCE2/$BOOT_BASE_DIR" || exit 1 + elif [ -d "$SOURCE/$BOOT_ISOLINUX" ] ; then echo "$SOURCE2/$BOOT_BASE_DIR/boot.catalog 3" >$SORTFILE echo "$BOOT_BASE_DIR/boot.catalog 3" >>$SORTFILE echo "$SOURCE/$BOOT_BASE_DIR/boot.catalog 3" >>$SORTFILE - find $SOURCE/$BOOT_ISOLINUX -printf "%p 1\n" >>$SORTFILE + find "$SOURCE/$BOOT_ISOLINUX" -printf "%p 1\n" >>$SORTFILE # last priority wins echo "$SOURCE/$BOOT_ISOLINUX/isolinux.bin 2" >>$SORTFILE echo "sortfile has" @@ -155,8 +155,8 @@ -b $BOOT_ISOLINUX/isolinux.bin -c $BOOT_BASE_DIR/boot.catalog \ -hide $BOOT_BASE_DIR/boot.catalog -hide-joliet $BOOT_BASE_DIR/boot.catalog" echo found boot image. Making CD bootable. - mkdir -p $SOURCE2/$BOOT_BASE_DIR || exit 1 - elif [ -f $SOURCE/ppc/bootinfo.txt -o -d $SOURCE/suseboot ] ; then + mkdir -p "$SOURCE2/$BOOT_BASE_DIR" || exit 1 + elif [ -f "$SOURCE/ppc/bootinfo.txt" -o -d "$SOURCE/suseboot" ] ; then # various ppc boards, no -J option echo removing follow-symlinks and joilet from mkisofs options echo adding long filenames, translation table, Untranslated filenames @@ -191,7 +191,7 @@ fi # check now for CHRP/iSeries vs PReP/pmac if the above is false if [ "$PPC_MKISOFS_CHRPBOOT" = "no" ] ; then - if [ -f $SOURCE/ppc/bootinfo.txt ] ; then + if [ -f "$SOURCE/ppc/bootinfo.txt" ] ; then # assume thats a pSeries/iSeries CD echo generic chrp bootblock missing echo upgrade mkisofs @@ -199,15 +199,15 @@ else # assume thats a PReP/Pmac CD # check if a PReP install file is available - if [ -f $SOURCE/boot/zImage.prep.initrd ] ; then + if [ -f "$SOURCE/boot/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot boot/zImage.prep.initrd" echo using boot/zImage.prep.initrd for PReP boot - elif [ -f $SOURCE/suse/images/zImage.prep.initrd ] ; then + elif [ -f "$SOURCE/suse/images/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot suse/images/zImage.prep.initrd" echo using suse/images/zImage.prep.initrd for PReP boot fi # check if a pmac kernel is available - if [ -d $SOURCE/suseboot ] ; then + if [ -d "$SOURCE/suseboot" ] ; then # create a mac partition table # use netatalk and macbinary filename translation # bless a directory named suseboot, mark it bootable @@ -227,21 +227,21 @@ fi else # new mkisofs with -chrp-boot option - if [ -f $SOURCE/ppc/bootinfo.txt ] ; then + if [ -f "$SOURCE/ppc/bootinfo.txt" ] ; then # assume thats a pSeries/iSeries CD echo "adding -chrp-boot for CHRP boot" PARAMS="$PARAMS -chrp-boot" fi # check if a PReP install file is available - if [ -f $SOURCE/boot/zImage.prep.initrd ] ; then + if [ -f "$SOURCE/boot/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot boot/zImage.prep.initrd" echo using boot/zImage.prep.initrd for PReP boot - elif [ -f $SOURCE/suse/images/zImage.prep.initrd ] ; then + elif [ -f "$SOURCE/suse/images/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot suse/images/zImage.prep.initrd" echo using suse/images/zImage.prep.initrd for PReP boot fi # check if a pmac kernel is available - if [ -d $SOURCE/suseboot ] ; then + if [ -d "$SOURCE/suseboot" ] ; then # create a mac partition table # use netatalk and macbinary filename translation # bless a directory named suseboot, mark it bootable @@ -260,11 +260,11 @@ fi # end ppc boards else - if [ -d $SOURCE/etc ] ; then + if [ -d "$SOURCE/etc" ] ; then echo found $SOURCE/etc. making sure, it is at the beginning of iso image. mkdir -p $SOURCE2/etc || exit 1 else - if [ -f $SOURCE/boot/silo.conf ] ; then + if [ -f "$SOURCE/boot/silo.conf" ] ; then PARAMS="$PARAMS -silo-boot boot/second.b -s /boot/silo.conf" echo found SPARC boot config. Making CD bootable. mkdir -p $SOURCE2/boot || exit 1 @@ -276,17 +276,17 @@ echo found no boot image. No bootable CD. fi - if test -f $SOURCE/content -a -z "$TMP_LS" ; then + if test -f "$SOURCE/content" -a -z "$TMP_LS" ; then # we already collected this above APPID=$DISTIDENT - elif test -f $SOURCE/$DESCRDIR/info ; then - set -- `fgrep DIST_IDENT $SOURCE/$DESCRDIR/info` + elif test -f "$SOURCE/$DESCRDIR/info" ; then + set -- `fgrep DIST_IDENT "$SOURCE/$DESCRDIR/info"` APPID=$2 else # If we have directory "update" in the second level, we assume # this is a Patch-CD if test ! -z "$TMP_LS" ; then - if test -f $SOURCE/media.1/patches ; then + if test -f "$SOURCE/media.1/patches" ; then APPID="`cat $SOURCE/media.1/patches | sed -e "s|/ ||g" | tr " " _`" else APPID="`cat $SOURCE/.S.u.S.E-disk-* | tr " " _`" @@ -294,23 +294,23 @@ fi fi if test -z "$APPID" \ - -a -f $SOURCE/$ROOT_ON_CD/MD5SUMS -a -f $SOURCE/.S.u.S.E-disk-* ; then - APPID=`cat $SOURCE/.S.u.S.E-disk-* | tr " " - | sed -e "s@-Version-@-@"` + -a -f "$SOURCE/$ROOT_ON_CD/MD5SUMS" -a -f "$SOURCE/.S.u.S.E-disk-*" ; then + APPID=`cat "$SOURCE/.S.u.S.E-disk-*" | tr " " - | sed -e "s@-Version-@-@"` APPID="$APPID.0#0" fi APPID=`echo $APPID | tr " " -` test -n "$APPID" && PARAMS="$PARAMS -A $APPID" - if test -f $SOURCE/content ; then + if test -f "$SOURCE/content" ; then MEDIANUMBER=1 - for i in $SOURCE/media.? ; do - test -d $i || continue - MEDIADIR=`ls -d $SOURCE/media.?` + for i in "$SOURCE/media.?" ; do + test -d "$i" || continue + MEDIADIR=`ls -d "$SOURCE/media.?"` MEDIANUMBER=${MEDIADIR##$SOURCE/media.} done VOL="0$MEDIANUMBER" - elif test -f $SOURCE/.S.u.S.E-disk-* ; then - BASE=`basename $SOURCE/.S.u.S.E-disk-*` + elif test -f "$SOURCE/.S.u.S.E-disk-*" ; then + BASE=`basename "$SOURCE/.S.u.S.E-disk-*"` VOL=`echo $BASE | cut -c 16-17` fi if test -n "$VOL" ; then @@ -344,7 +344,7 @@ mkisofs \ -p "$CD_PREPARER" \ $PUB_OPT "$CD_PUBLISHER" \ - $PARAMS -o $DEST $XPARAMS $SOURCE + $PARAMS -o "$DEST" $XPARAMS "$SOURCE" set +x Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Mon May 28 11:11:35 2007 @@ -390,8 +390,6 @@ } ); - y2internal("Escaped sources: %1", sources); - v["sources"] = sources; } @@ -623,6 +621,7 @@ boolean ExportPublicKey(string keyid, string dir) { + y2debug("ExportPublicKey: %1 to %2", keyid, dir); // export the public key boolean ret = GPG::ExportAsciiPublicKey(keyid, dir + "/content.key"); @@ -687,7 +686,7 @@ string meta_sha1 = SHA1Meta(dir, prod_dir); string key_sha1 = SHA1Key(dir); - string command = sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' %1/content", dir); + string command = sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' '%1/content'", String::Quote(dir)); map out = (map)SCR::Execute(.target.bash_output, command); if (out["exit"]:-1 != 0) { @@ -1029,7 +1028,7 @@ skel_root = sformat("%1/%2", Config["iso-directory"]:"", Config["name"]:""); SCR::Execute(.target.mkdir, skel_root); - Exec(sformat("/bin/mkdir -p %1/boot/%2", skel_root, arch)); + Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(arch))); list<integer> enabled = Pkg::SourceGetCurrent(true); if (size(enabled) == 0 ) @@ -1043,18 +1042,18 @@ { if (Config["code10"]:false) { - Exec(sformat("/bin/mkdir -p %1/boot/%2/loader", skel_root, arch)); + Exec(sformat("/bin/mkdir -p '%1/boot/%2/loader'", String::Quote(skel_root), String::Quote(arch))); } else { - Exec(sformat("/bin/mkdir -p %1/boot/loader", skel_root)); + Exec(sformat("/bin/mkdir -p '%1/boot/loader'", String::Quote(skel_root))); } } else if (Arch::ppc() || Arch::ppc64()) { - Exec(sformat("/bin/mkdir -p %1/etc", skel_root)); - Exec(sformat("/bin/mkdir -p %1/ppc", skel_root)); - Exec(sformat("/bin/mkdir -p %1/suseboot", skel_root)); + Exec(sformat("/bin/mkdir -p '%1/etc'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/suseboot'", String::Quote(skel_root))); } // detect the base source @@ -1065,7 +1064,7 @@ foreach(integer srcid, string dir, product_map, { if (dir != "/") { - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, dir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(dir))); } } ); @@ -1159,7 +1158,7 @@ // copy the descr directory - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrDir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrDir))); CopyDirectoryRec(id, 1, descrDir, sformat("%1/%2", skel_root, UpDir(descrDir))); sp = true; @@ -1175,14 +1174,14 @@ descrDir = this_source["productData","descrdir"]:"suse/setup/descr"; dataDir = this_source["productData", "datadir"]:"suse"; y2debug("source data: %1", this_source["sourceData", "url"]:"" ); - success = (boolean)SCR::Execute(.target.mkdir, sformat("%1/%2", skel_root, dataDir)); + success = (boolean)SCR::Execute(.target.mkdir, sformat("'%1/%2'", String::Quote(skel_root), String::Quote(dataDir))); if (!success) { - y2error("Cannot create directory: %1", sformat("%1/%2", skel_root, dataDir)); + y2error("Cannot create directory: %1", sformat("'%1/%2'", String::Quote(skel_root), String::Quote(dataDir))); return false; } - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrDir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrDir))); if (savespace) { @@ -1226,7 +1225,7 @@ // Prepare media files CopyDirectoryRec(id, 1, "media.1", skel_root); - Exec(sformat("/usr/bin/head -n 2 %1/media.1/media > %2/media.1/media.tmp && mv %2/media.1/media.tmp %2/media.1/media", skel_root, skel_root)); + Exec(sformat("/usr/bin/head -n 2 %1/media.1/media > %1/media.1/media.tmp && mv %1/media.1/media.tmp %1/media.1/media", String::Quote(skel_root))); } else { @@ -1326,7 +1325,7 @@ // copy descriptions string descrdir = meta[source_id, "productData","descrdir"]:"suse/setup/descr"; - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrdir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrdir))); CopyDirectoryRec(source_id, 1, descrdir, sformat("%1/%2", skel_root, UpDir(descrdir))); string datadir = meta[source_id, "productData", "datadir"]:"suse"; @@ -1345,22 +1344,22 @@ if (l_slidedir != nil && l_slidedir != "") { // copy slide show - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, slidedir)); - Exec(sformat("/bin/cp -a %1/* %2/%3", l_slidedir, skel_root, slidedir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("/bin/cp -a -- '%1/*' '%2/%3'", String::Quote(l_slidedir), String::Quote(skel_root), String::Quote(slidedir))); } } else { y2milestone("Slideshow is missing"); - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, slidedir)); - Exec(sformat("> %1/%2/directory.yast", skel_root, slidedir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("> '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(slidedir))); } } else { y2milestone("Save space - do not copy the slideshow"); - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, slidedir)); - Exec(sformat("> %1/%2/directory.yast", skel_root, slidedir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("> '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(slidedir))); } y2milestone("source: %1, descrDir: %2, skel_root: %3", source, descrDir, skel_root); @@ -1368,7 +1367,7 @@ // copy media.1 directory CopyDirectoryRec(source_id, 1, "media.1", skel_root); - Exec(sformat("/usr/bin/head -n 2 %1/media.1/media > %2/media.1/media.tmp && mv %2/media.1/media.tmp %2/media.1/media", skel_root, skel_root)); + Exec(sformat("/usr/bin/head -n 2 '%1/media.1/media' > '%1/media.1/media.tmp' && mv '%1/media.1/media.tmp' '%1/media.1/media'", String::Quote(skel_root))); // create a copy of the autoyast profile (the new profile accepts even unsigned source) string autoyast_copy = ""; @@ -1429,32 +1428,34 @@ if (autoyast_copy != "") { // save the original file and the copy - Exec(sformat("/bin/cp %1 %2/autoinst.xml", autoyast_copy, skel_root)); - Exec(sformat("/bin/cp %1 %2/autoinst.orig.xml", Config["profile"]:"", skel_root)); + Exec(sformat("/bin/cp -- '%1' '%2/autoinst.xml'", String::Quote(autoyast_copy), String::Quote(skel_root))); + Exec(sformat("/bin/cp -- '%1' '%2/autoinst.orig.xml'", String::Quote(Config["profile"]:""), String::Quote(skel_root))); } else { // save the original file (a copy is not available) - Exec(sformat("/bin/cp %1 %2/autoinst.xml", Config["profile"]:"", skel_root)); + Exec(sformat("/bin/cp '%1' '%2/autoinst.xml'", String::Quote(Config["profile"]:""), String::Quote(skel_root))); } } // Media nr. integer count = 1; - Exec(sformat("/bin/echo %1 >> %2/media.1/media ", count, skel_root)); + Exec(sformat("/bin/echo %1 >> '%2/media.1/media'", count, String::Quote(skel_root))); // make the source digitally unsigned (because signed descr/packages file has been modified) if (Config["code10"]:false) { // remove the key and the checksum - Exec(sformat("/bin/rm %1/content.asc %1/content.key", skel_root)); + Exec(sformat("/bin/rm '%1/content.asc' '%1/content.key'", String::Quote(skel_root))); // remove the meta information from content file - Exec(sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' %1/content > %1/content.new", skel_root)); - Exec(sformat("/bin/mv %1/content.new %1/content", skel_root)); + Exec(sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' '%1/content' > '%1/content.new'", String::Quote(skel_root))); + Exec(sformat("/bin/mv '%1/content.new' '%1/content'", String::Quote(skel_root))); // recreate the index file - Exec(sformat("/bin/rm -f %1/directory.yast && /usr/bin/create_directory.yast %1", skel_root)); +// FIXME: use create_directory when it supports parameter with spaces +// Exec(sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(skel_root))); + Exec(sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(skel_root))); } @@ -1498,7 +1499,7 @@ if (!match) { // remove the pattern - string cmd = sformat("/bin/rm %1/%2/%3", skel_root, descrDir, f); + string cmd = sformat("/bin/rm -- '%1/%2/%3'", String::Quote(skel_root), String::Quote(descrDir), String::Quote(f)); y2milestone("removing pattern %1", f); success = success && Exec(cmd); y2debug("success: %1", success); @@ -1510,11 +1511,12 @@ if (refresh_diryast) { // regenerate directory.yast and patterns file - string cmd = sformat("/bin/rm -f '%1/%2/directory.yast' && /usr/bin/create_directory.yast '%1/%2'", String::Quote(skel_root), String::Quote(descrDir)); + // FIXME: string cmd = sformat("/bin/rm -f -- '%1/%2/directory.yast' && /usr/bin/create_directory.yast '%1/%2'", String::Quote(skel_root), String::Quote(descrDir)); + string cmd = sformat("/bin/rm -f '%1/%2/directory.yast'; cd '%1/%2'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(descrDir)); success = success && Exec(cmd); y2debug("success: %1", success); - cmd = sformat("cd %1/%2; ls *.pat > %1/%2/patterns", skel_root, descrDir); + cmd = sformat("cd '%1/%2'; ls *.pat > '%1/%2/patterns'", String::Quote(skel_root), String::Quote(descrDir)); success = success && Exec(cmd); y2debug("success: %1", success); } @@ -1525,6 +1527,8 @@ y2debug("success: %1", success); }); + skel_root = main_skel_root; + string addon_file = CreateAddonFile(product_map); if (size(addon_file) > 0) { @@ -1636,7 +1640,8 @@ if (success) { // update directory.yast file - string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(dir)); + // FIXME string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(dir)); + string command = sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(dir)); y2milestone("Updating %1/directory.yast ...", dir); integer updated = (integer)SCR::Execute(.target.bash, command); y2milestone("Updated: %1", updated == 0); @@ -1739,13 +1744,13 @@ SCR::Write(.target.string, fname, Config["bootconfig"]:"" ); } cpCmd = (Config["code10"]:false) - ? sformat("cp %1/product-creator/message %2/boot/%3/loader", Directory::datadir, skel_root, arch) - : sformat("cp %1/product-creator/message %2/boot/loader", Directory::datadir, skel_root); + ? sformat("cp -- '%1/product-creator/message' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch) + : sformat("cp -- '%1/product-creator/message' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root)); SCR::Execute (.target.bash, cpCmd); cpCmd = (Config["code10"]:false) - ? sformat("cp %1/product-creator/options.msg %2/boot/%3/loader", Directory::datadir, skel_root, arch) - : sformat("cp %1/product-creator/options.msg %2/boot/loader", Directory::datadir, skel_root); + ? sformat("cp -- '%1/product-creator/options.msg' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch) + : sformat("cp -- '%1/product-creator/options.msg' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root)); SCR::Execute (.target.bash, cpCmd); @@ -1917,7 +1922,7 @@ global boolean removeDestination() { string isodir = Config["iso-directory"]:"" + "/" + Config["name"]:""; - return (integer)SCR::Execute(.target.bash, "rm -rf " + isodir ) == 0; + return (integer)SCR::Execute(.target.bash, sformat("rm -rf -- '%1'", String::Quote(isodir)) ) == 0; } global boolean confirmDestinationRemoving() @@ -2100,7 +2105,7 @@ break; } - string cpCmd = sformat("cp -a %1 %2", l_packge, dir ); + string cpCmd = sformat("cp -a '%1' '%2'", String::Quote(l_packge), String::Quote(dir) ); y2debug("%1", cpCmd); @@ -2126,13 +2131,13 @@ // regenerate the metadata if (general_info["type"]:"" == "YUM") { - ret = ret && Exec(sformat("/usr/bin/createrepo %1/%2", basedir, subdir)); + ret = ret && Exec(sformat("/usr/bin/createrepo '%1/%2'", String::Quote(basedir), String::Quote(subdir))); } else { // TODO FIXME get datadir from the source - ret = ret && Exec(sformat("cd %1/%2/%3 && /usr/bin/create_package_descr -x setup/descr/EXTRA_PROV", - basedir, subdir, datadir)); + ret = ret && Exec(sformat("cd '%1/%2/%3' && /usr/bin/create_package_descr -x setup/descr/EXTRA_PROV", + String::Quote(basedir), String::Quote(subdir), String::Quote(datadir))); } } ); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp Mon May 28 11:11:35 2007 @@ -16,6 +16,7 @@ import "Wizard_hw"; import "Report"; import "Arch"; + import "String"; import "ProductCreator"; @@ -107,7 +108,7 @@ contents = Wizard_hw::SpacingAround(contents2, 1.5, 1.5, 1.0, 1.0); Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", - Label::BackButton(), Label::FinishButton()); + Label::BackButton(), Label::CloseButton()); if (size(overview) == 0 ) { @@ -334,7 +335,7 @@ string pub = ProductCreator::Config["publisher"]:"anon"; string prep = ProductCreator::Config["preparer"]:"anon"; - map output = (map)SCR::Execute(.target.bash_output, sformat("du -s -b %1 | awk -F' ' ' { printf $1 }'", isodir )); + map output = (map)SCR::Execute(.target.bash_output, sformat("du -s -b '%1' | awk -F' ' ' { printf $1 }'", String::Quote(isodir) )); string du = output["stdout"]:""; y2milestone("Expected size: %1", du); @@ -343,7 +344,7 @@ Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while")); } - string command = sformat("/usr/lib/YaST2/bin/y2mkiso %1 %2 %3", isodir, isofile, (ProductCreator::Config["code10"]:false) ? Arch::architecture() : ""); + string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote((ProductCreator::Config["code10"]:false) ? Arch::architecture() : "")); y2milestone("command: %1", command); SCR::Execute (.target.bash, command, $["CD_PUBLISHER": pub, "CD_PREPARER": prep ]); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Mon May 28 11:11:35 2007 @@ -239,7 +239,8 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("cd-creator"); - if (!Package::InstallAll(["inst-source-utils", "mkisofs"])) + // .content_file agent is in yast2-instserver package - TODO: move it to yast2.rpm + if (!Package::InstallAll(["inst-source-utils", "mkisofs", "yast2-instserver"])) { Popup::Error(_("Installation of required packages failed.")); -- 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] r38156 - /tags/stable-2_15_27/installation/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:21:07 2007 New Revision: 38156 URL: http://svn.opensuse.org/viewcvs/yast?rev=38156&view=rev Log: Created tag stable-2_15_27 for installation Added: tags/stable-2_15_27/installation/ - copied from r38155, trunk/installation/ -- 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] r38155 - /tags/stable-2_15_34/network/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:20:48 2007 New Revision: 38155 URL: http://svn.opensuse.org/viewcvs/yast?rev=38155&view=rev Log: Created tag stable-2_15_34 for network Added: tags/stable-2_15_34/network/ - copied from r38154, trunk/network/ -- 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] r38154 - in /trunk/network: ./ package/ src/installation/ src/modules/ src/routines/ testsuite/tests/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:20:39 2007 New Revision: 38154 URL: http://svn.opensuse.org/viewcvs/yast?rev=38154&view=rev Log: installation network changes: http://lists.opensuse.org/yast-devel/2007-05/msg00025.html Added: trunk/network/src/routines/save_network.ycp - copied, changed from r37972, trunk/network/src/routines/install.ycp Removed: trunk/network/src/installation/inst_netsetup.ycp trunk/network/src/routines/install.ycp trunk/network/testsuite/tests/install.ycp Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/installation/Makefile.am trunk/network/src/modules/Lan.ycp trunk/network/src/modules/NetworkStorage.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38154&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 28 10:20:39 2007 @@ -1 +1 @@ -2.15.33 +2.15.34 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 28 10:20:39 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 28 10:20:08 CEST 2007 - mzugec(a)suse.cz + +- installation network changes: +http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.34 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/network/src/installation/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/Makefil… ============================================================================== --- trunk/network/src/installation/Makefile.am (original) +++ trunk/network/src/installation/Makefile.am Mon May 28 10:20:39 2007 @@ -8,7 +8,7 @@ client_DATA = inst_ask_net_test.ycp inst_do_net_test.ycp \ inst_hostname.ycp \ - inst_netprobe.ycp inst_netsetup.ycp + inst_netprobe.ycp EXTRA_DIST = $(ynclude_DATA) $(client_DATA) $(ybin_SCRIPTS) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon May 28 10:20:39 2007 @@ -189,11 +189,6 @@ // FIXME: MOD list<string> DeletedModules = []; /** - * /etc/install.inf data - */ -map InstallInf = $[]; - -/** * Data was modified? */ boolean modified = false; @@ -312,7 +307,7 @@ } include "network/hardware.ycp"; -include "network/install.ycp"; +//include "network/install.ycp"; include "network/routines.ycp"; include "network/runtime.ycp"; @@ -439,7 +434,7 @@ if(Abort()) return false; /* Progress step 7/9 */ ProgressNextStage(_("Reading installation information...")); - ReadInstallInf(); +// ReadInstallInf(); sleep(sl); if(Abort()) return false; @@ -1559,9 +1554,10 @@ } else { // this is the first interface, match the hardware with install.inf - +/* + // couldn't happen if (size(InstallInf)>0){ - /* Select the one from install.inf with the same MAC */ + // Select the one from install.inf with the same MAC // find H["mac"] == InstallInf["hwaddr"] if (tosel == nil ) { string hwaddr = InstallInf["hwaddr"]:""; @@ -1571,7 +1567,7 @@ y2milestone("Rule: matching hwaddr in install.inf"); } - /* Select the one from install.inf with the same module */ + // Select the one from install.inf with the same module // find H["module"] == InstallInf["module"] if (tosel == nil) { string infmodule = InstallInf["module"]:""; @@ -1580,7 +1576,9 @@ } y2milestone("Rule: matching module in install.inf"); } - } else{ + } else +*/ + { /* No install.inf -> select the first connected */ // find H["active"] == true if (tosel == nil) { @@ -1675,7 +1673,7 @@ global define boolean ProposeInterfaces () { y2milestone("Hardware=%1", Hardware); - y2milestone("InstallInf=%1", InstallInf); +// y2milestone("InstallInf=%1", InstallInf); y2milestone("NetworkConfig::Config=%1", NetworkConfig::Config); y2milestone("NetworkConfig::DHCP=%1", NetworkConfig::DHCP); @@ -1710,7 +1708,7 @@ /* Some HW found -> use it for proposal */ if(size(Hardware) > 0) { if (Arch::s390()){ - tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); +// tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); } else tosel = FindMatchingDevice($[]); @@ -1720,6 +1718,7 @@ y2debug("Hardware=%1", Hardware); y2milestone ("Selected HW w/o install.inf patches: %1", tosel); +/* // do not select a card without a driver, #29296 if (tosel != nil) { @@ -1736,12 +1735,12 @@ // SelectHW relies on the detected info (eg. busid) from hwinfo // which is not in install.inf + if (InstallInf["module"]:"" != "") { y2milestone ("Using driver module from install.inf"); tosel["module"] = InstallInf["module"]:""; } - // L3 bug: 75720 // Setup module options available from /etc/install.inf string _options = InstallModuleOptions(tosel["module"]:""); @@ -1755,9 +1754,9 @@ // set layer2 status from /etc/install.inf qeth_layer2 = (InstallInf["QETH_LAYER2_SUPPORT"]:"0"=="1")?true:false; qeth_macaddress = InstallInf["LLADDR"]:""; - } - /* Nothing detected -> use InstallInf */ + // Nothing detected -> use InstallInf + else if(size(InstallInf) > 0) { if(!haskey(InstallInf, "module")) { @@ -1775,10 +1774,12 @@ type = InstallInf["type"]:"eth"; device = NetworkDevices::GetFreeDevice(type); } + else { y2milestone("No hardware, no install.inf -> no proposal."); return false; } +*/ // here we know the hardware and could fill the interface defaults for it, // like for wifi usercontrol and for eth|wifi ifplugd. @@ -1788,24 +1789,24 @@ SetDefaultsForHW (); // #145041 - ethtool_options = InstallInf["ethtool_options"]:""; +// ethtool_options = InstallInf["ethtool_options"]:""; // #176804 - if (NetworkStorage::RootIsOnNetwork ()) + if (NetworkStorage::RootIsOnNetwork ("/")) { startmode = "nfsroot"; y2milestone ("startmode nfsroot"); } - ipaddr = InstallInf["ipaddr"]:""; - bootproto = InstallInf["bootproto"]:"static"; +// ipaddr = InstallInf["ipaddr"]:""; +// bootproto = InstallInf["bootproto"]:"static"; y2debug("ipaddr,bootproto=%1,%2", ipaddr, bootproto); if(bootproto == "static" && ipaddr != "" && ipaddr != nil) { y2milestone("static proposal"); /* propose address setup from /etc/install.inf */ - netmask = InstallInf["netmask"]:""; +// netmask = InstallInf["netmask"]:""; if(netmask == nil || netmask == "") netmask = "255.255.255.0"; } @@ -1854,12 +1855,13 @@ return false; } +/* y2milestone ("hostname from install.inf"); if (! DNS::ReadHostDomain (InstallInf["hostname"]:"", InstallInf["domain"]:"")) { y2milestone ("hostname from dns"); - /* try to get hostname from the network */ + // try to get hostname from the network string hnent = Detection::ResolveIP(ipaddr); //last resort - generate random hostname (#165269) @@ -1876,7 +1878,7 @@ } } - +*/ return true; } @@ -1887,10 +1889,10 @@ global define boolean ProposeRoutesAndResolver () { if(bootproto == "static" && ipaddr != "" && ipaddr != nil) { /* propose default gateway from /etc/install.inf */ - Routing::ReadFromGateway (InstallInf["gateway"]:""); +// Routing::ReadFromGateway (InstallInf["gateway"]:""); /* propose DNS setup from /etc/install.inf */ - DNS::ReadNameserver (InstallInf["nameserver"]:""); +// DNS::ReadNameserver (InstallInf["nameserver"]:""); ProposeHostname (); } return true; @@ -1946,6 +1948,7 @@ SelectHWMap(tosel); } /* Nothing detected -> use InstallInf */ +/* else if(size(InstallInf) > 0) { if(!haskey(InstallInf, "module")) { @@ -1955,9 +1958,10 @@ NetworkModules::Alias = InstallInf["module"]:""; NetworkModules::Options = InstallInf["options"]:""; - type = InstallInf["type"]:"eth"; +// type = InstallInf["type"]:"eth"; device = NetworkDevices::GetFreeDevice(type); } +*/ else { y2milestone("No hardware, no install.inf -> no autoinstallation possible."); return false; @@ -1990,7 +1994,7 @@ } Commit(); }); - } + } else { y2milestone ("no interface configuration, taking it from install.inf"); @@ -2002,12 +2006,12 @@ if (autoinstall_settings["routing", "routes"]:[] == []) { y2milestone ("gateway from install.inf"); - Routing::ReadFromGateway (InstallInf["gateway"]:""); +// Routing::ReadFromGateway (InstallInf["gateway"]:""); } if (autoinstall_settings["dns", "nameservers"]:[] == []) { y2milestone ("nameserver from install.inf"); - DNS::ReadNameserver (InstallInf["nameserver"]:""); +// DNS::ReadNameserver (InstallInf["nameserver"]:""); } if (autoinstall_settings["dns", "hostname"]:"" == "") { @@ -2037,7 +2041,7 @@ global define list<map> PrepareForAutoinst() { - ReadInstallInf(); +// ReadInstallInf(); Hardware = ReadHardware("netcard"); return Hardware; } Modified: trunk/network/src/modules/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetworkStora… ============================================================================== --- trunk/network/src/modules/NetworkStorage.ycp (original) +++ trunk/network/src/modules/NetworkStorage.ycp Mon May 28 10:20:39 2007 @@ -13,16 +13,37 @@ module "NetworkStorage"; +global string getDevice(string mount_point){ + map out = (map)SCR::Execute(.target.bash_output, sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|cut -d' ' -f1|tr -d '\n'", mount_point)); + string device=deletechars(out["stdout"]:"", "1234567890"); + y2internal("%1", device); + return device; +} + +global boolean isDiskOnNetwork(string device){ + boolean ret=false; + foreach(map<string, any> disk, (list<map<string, any> >)SCR::Read(.probe.disk), { + y2milestone("%1", disk["dev_name"]:""); +y2internal("%1", device); + if (disk["dev_name"]:""==device){ + foreach(string row, disk["dev_names"]:[], { + if (issubstring(row, "iscsi")) ret=true; + }); + } + }); + return ret; +} + /** * If the root is on a networked device (NFS, ISCSI), * the main NIC needs STARTMODE nfsroot instead of auto. * @return root dev over network */ -global boolean RootIsOnNetwork () { +global boolean RootIsOnNetwork (string root) { // in create_interface script there is similar code (if some changes needed, don't forget check also that file) // in case that parameter "root=..." is not defined (read from /proc/cmdline) say that device is NOT network - string iscsi_cmd = " - ROOT_DISK=$(grep ' / ' /proc/mounts|grep -v rootfs|cut -d' ' -f1); + string iscsi_cmd = sformat(" + ROOT_DISK=$(grep ' %1 ' /proc/mounts|grep -v rootfs|cut -d' ' -f1); if [ -n \"$(echo $ROOT_DISK|grep 'by-id\\|by-uuid\\|by-path\\|by-label')\" ] then echo by-id or by-UUID or by-path or by-label @@ -32,7 +53,6 @@ ROOTPART=${ROOT_DISK##*/} fi - echo ROOTPART=\"$ROOTPART\" # use * and .. to get to the device containing ROOTPART case `cd -P /sys/block/*/\"$ROOTPART\"/../device && pwd` in *session*) @@ -41,7 +61,7 @@ IS_ISCSI=false ;; esac $IS_ISCSI -"; +", root); map out = (map) SCR::Execute (.target.bash_output, iscsi_cmd); y2milestone ("%1", out); return out["exit"]:-1 == 0; Copied: trunk/network/src/routines/save_network.ycp (from r37972, trunk/network/src/routines/install.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/save_networ… ============================================================================== --- trunk/network/src/routines/install.ycp (original) +++ trunk/network/src/routines/save_network.ycp Mon May 28 10:20:39 2007 @@ -16,6 +16,16 @@ import "Hostname"; import "IP"; import "NetworkDevices"; +import "FileUtils"; +import "Netmask"; +import "NetworkStorage"; +import "Installation"; +import "String"; + +map <string, any> InstallInf = $[]; + +// global variable because chrooted environment +boolean network_disk=false; /** * Read one install.inf item @@ -26,8 +36,10 @@ define boolean ReadInstallInfItem(path install_inf, string item, string var) { if(item == nil || item == "" || var == nil || var == "") return false; string val = (string) SCR::Read(add(install_inf, var)); +//y2internal("val %1 %2", item, val); if(val == nil) return false; if(val != "") InstallInf[item] = val; +//y2internal("%1", InstallInf); return true; } @@ -42,8 +54,6 @@ */ define boolean ReadInstallInf() { - InstallInf = $[]; - /* Detect install.inf location */ path install_inf = nil; if(SCR::Read(.target.size,"/etc/install.inf") > 0) { @@ -60,15 +70,21 @@ /* Read install.inf items */ ReadInstallInfItem(install_inf, "ipaddr", "IP"); ReadInstallInfItem(install_inf, "netmask", "Netmask"); + ReadInstallInfItem(install_inf, "bcast", "Broadcast"); + ReadInstallInfItem(install_inf, "remote_ip", "Pointopoint"); + ReadInstallInfItem(install_inf, "mtu", "IP_MTU"); ReadInstallInfItem(install_inf, "bootproto", "NetConfig"); ReadInstallInfItem(install_inf, "netdevice", "Netdevice"); ReadInstallInfItem(install_inf, "gateway", "Gateway"); ReadInstallInfItem(install_inf, "nameserver", "Nameserver"); + ReadInstallInfItem(install_inf, "domain", "Domain"); ReadInstallInfItem(install_inf, "hostname", "Hostname"); ReadInstallInfItem(install_inf, "module", "Alias"); - ReadInstallInfItem(install_inf, "options", "Options"); +// ReadInstallInfItem(install_inf, "options", "Options"); ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); ReadInstallInfItem(install_inf, "ethtool_options", "ethtool"); + ReadInstallInfItem(install_inf, "unique", "NetUniqueID"); + ReadInstallInfItem(install_inf, "connect_wait", "ConnectWait"); ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2"); ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); @@ -77,9 +93,8 @@ string netdevice = InstallInf["netdevice"]:""; if(netdevice != "") { string devtype = NetworkDevices::device_type(netdevice); - if(devtype != nil && devtype != "") - InstallInf["type"] = devtype; - InstallInf = remove(InstallInf, "netdevice"); + if(devtype != nil && devtype != "") InstallInf["type"] = devtype; +// InstallInf = remove(InstallInf, "netdevice"); } /* Split FQ hostname */ @@ -150,6 +165,229 @@ return ""; } +map<string, any> getcfg(string options, string device){ + map <string, any> cfg=$[]; + map <string, any> output = (map <string, any>)SCR::Execute(.target.bash_output, + sformat("getcfg %1 %2", options, device)); +// if (output["exit"]:0==0){ + foreach(string row, splitstring(output["stdout"]:"", "\n"), { + row=deletechars(row, "\\\"\;"); + list<string> keyval=splitstring(row, "="); + if (size(keyval)>1) cfg[keyval[0]:""]=keyval[1]:""; + + }); +// } + y2milestone("%1 %2\n%3", options, device, cfg); + return cfg; +} + +string getHWFullPath(string hwfile){ + return sformat("%1/hwcfg-%2", "/etc/sysconfig/hardware", hwfile); +} + + +map <string,any> hwcfg=$[]; + +string CreateHardwareFile(){ + string hwfile=""; + + // read current hardware information and check if configuration file exists + hwcfg=getcfg("-f hwcfg- -d /etc/sysconfig/hardware", InstallInf["netdevice"]:""); + if( tointeger(hwcfg["HWD_CONFIG_N"]:"0")==0 ){ + y2internal("hwcfg doesn't exist"); + // check if deriver is connected to bus + if (tointeger(hwcfg["HWD_BUS_N"]:"0")>0){ + string busname = hwcfg[sformat("HWD_BUSNAME_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; + string busid = hwcfg[sformat("HWD_BUSID_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; + if (busname == "vio" && FileUtils::IsDirectory("/proc/iSeries")){ + // Bug 159652 - LTC22358 - no hwcfg-static files created for iseries_veth + hwfile = sformat("static-0"); + y2warning("vio bus type, using %1", hwfile); + } else { + hwfile = sformat("bus-%1-%2", busname, busid); + y2internal("will create hwcfg file %1", hwfile); + } + + } else { + hwfile = sformat("static-0"); + y2error("Not connected to bus! Using %1", hwfile); + } + string content=sformat("STARTMODE='auto'\nMODULE='%1'\nMODULE_OPTIONS='%2'\n", InstallInf["module"]:"", InstallInf["options"]:""); + y2internal ("creating %1 file\n%2", hwfile, content); + SCR::Write(.target.string, getHWFullPath(hwfile), content); + }else { + // in case of s390 hwcfg is created by Linuxrc (uli) + y2warning("hwcfg already exists"); + hwfile = hwcfg[sformat("HWD_CONFIG_%1", tointeger(hwcfg["HWD_CONFIG_N"]:"0")-1)]:""; + y2internal("configuration name = %1", hwfile); + } + y2internal("Hardware file: %1", getHWFullPath(hwfile)); + + return hwfile; +} + +string getIfcName(string hwfile){ + string ifcfg=""; + string interfacetype = NetworkDevices::device_type( hwcfg[sformat("HWD_INTERFACE_%1", tointeger(hwcfg["HWD_INTERFACE_N"]:"0")-1)]:"" ); + // for special s390 interface types write static configuration + if (contains(["qeth", "hsi", "ctc", "lcs", "iucv"], interfacetype)){ + y2internal("special device type %1", interfacetype); + ifcfg=sformat("ifcfg-%1", hwfile); + } else { + y2internal("usual type %1", interfacetype); + // if MAC available - use it for name + if (size(hwcfg["HWD_ID"]:"")>0){ + ifcfg = sformat("ifcfg-%1-id-%2", interfacetype, hwcfg["HWD_ID"]:""); + y2internal("MAC address available - use it for name %1", ifcfg); + } else { + // in case MAC is not available, use device name (eth0) + ifcfg = sformat("ifcfg-%1", hwcfg[sformat("HWD_INTERFACE_%1", tointeger(hwcfg["HWD_INTERFACE_N"]:"0")-1)]:""); + y2internal("MAC address not available - use device name %1", ifcfg); + } + } + y2internal("interface configuration file %1", ifcfg); + return ifcfg; +} + +void CreateIfcfg(string hwcfg, string ifcfg){ + string network_configuration=""; + // set BOOTPROTO=[ static | dhcp ] + if (InstallInf["bootproto"]:"dhcp"=="static") { + // add broadcast interface #suse49131 + network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", + InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); + } else { + network_configuration="BOOTPROTO='dhcp'\n"; + // set DHCP_SET_HOSTNAME=yes #suse30528 + y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); + SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); + } + + // if available, write MTU + if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); + + + if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); + + if (size(InstallInf["unique"]:"")>0) + { + // write UNIQUE - #suse25739 + network_configuration = sformat("%1UNIQUE='%2'\n", network_configuration, InstallInf["unique"]:""); + // write UDI + list<map> cards=(list<map>)SCR::Read(.probe.netcard); + foreach(map card, cards, { + if (card["unique_key"]:""==InstallInf["unique"]:"") network_configuration = sformat("%1udi='%2'\n", network_configuration, card["udi"]:""); + }); + } + + if (network_disk){ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); + } else{network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); + } + + // reference to hardware configuration + network_configuration = sformat("%1_nm_name='%2'\n", network_configuration, hwcfg); + + // point to point interface + if (size(InstallInf["remote_ip"]:"")>0)network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); + + + y2internal("Network Configuration:\n%1\n%2", network_configuration, ifcfg); + + // write only if file doesn't exists + string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); +// string dev_file=sformat("/tmp/%1", ifcfg); + if (!FileUtils::Exists(dev_file)) { + SCR::Write(.target.string, dev_file, network_configuration); + y2internal("ifcfg file: %1", dev_file); + } + else y2warning("File exists %1", dev_file); +} + +/* + * create all network files except ifcfg and hwcfg + * directly to installed system + */ + +void CreateOtherNetworkFiles(){ + // create routes file + if (size(InstallInf["gateway"]:"")>0){ + y2milestone("Writing route : %1", InstallInf["gateway"]:""); + SCR::Write(.target.string, "/etc/sysconfig/network/routes", InstallInf["gateway"]:""); + } else y2warning("No routing information in install.inf"); + + // create hostname + if (size(InstallInf["hostname"]:"")>0){ + y2milestone("Write HOSTANAME: %1", InstallInf["hostname"]:""); + SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:""); + } + + // create resolv.conf + if (size(InstallInf["domain"]:"")>0 && size(InstallInf["nameserver"]:"")>0){ + string text=sformat("domain %1 +nameserver %2", InstallInf["domain"]:"", InstallInf["nameserver"]:""); + y2milestone("Write resolv.conf content: %1", text); + SCR::Write(.target.string, "/etc/resolv.conf", text); + } + + // create defaultdomain + if (size(InstallInf["domain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ + y2milestone("Write defaultdomain: %1", InstallInf["domain"]:""); + SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["domain"]:""); + } + + // write wait_for_interfaces if needed + if (size(InstallInf["connect_wait"]:"")>0){ + SCR::Execute(.target.bash_output, sformat("sed -i s/^WAIT_FOR_INTERFACES=.*/WAIT_FOR_INTERFACES=%1/g /etc/sysconfig/network/config", InstallInf["connect_wait"]:"")); + } +} + +/* + * this replaces bash script create_interface + */ +void save_network(){ + + // skip from chroot + integer old_SCR = WFM::SCRGetDefault (); + integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); + WFM::SCRSetDefault (new_SCR); + + SCR::Execute(.target.bash, sformat("cp /etc/sysconfig/hardware/* %1/etc/sysconfig/hardware/ 2>/dev/null", Installation::destdir)); + + // when root is on nfs/iscsi set startmode=nfsroot #176804 + string device = NetworkStorage::getDevice( Installation::destdir ); + y2internal("%1 directory is on %2 device", Installation::destdir, device); + network_disk = NetworkStorage::isDiskOnNetwork( device ); + + // -------------------------------------------------------------- + // Copy DHCP client cache so that we can request the same IP (#43974). + WFM::Execute (.local.bash, sformat ( + "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", + "/var/lib/dhcpcd", + String::Quote (Installation::destdir))); + + // close and chroot back + WFM::SCRClose (new_SCR); + WFM::SCRSetDefault (old_SCR); + + if(ReadInstallInf()){ + string hwcfg = CreateHardwareFile(); + string ifcfg = getIfcName(hwcfg); + + CreateIfcfg(hwcfg, ifcfg); + CreateOtherNetworkFiles(); + + SCR::Execute(.target.bash, "chkconfig network on"); + + // if portmap running - start it after reboot + WFM::Execute (.local.bash, + "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + + + } else + y2error("Error while reading install.inf!"); + +} +save_network(); /* EOF */ } -- 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] r38153 - in /trunk/installation: VERSION control/control.openSUSE.xml control/control.xml package/yast2-installation.changes src/clients/network_finish.ycp startup/Second-Stage/S07-medium
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:16:01 2007 New Revision: 38153 URL: http://svn.opensuse.org/viewcvs/yast?rev=38153&view=rev Log: installation network changes: http://lists.opensuse.org/yast-devel/2007-05/msg00025.html Modified: trunk/installation/VERSION trunk/installation/control/control.openSUSE.xml trunk/installation/control/control.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/network_finish.ycp trunk/installation/startup/Second-Stage/S07-medium Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=38153&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon May 28 10:16:01 2007 @@ -1 +1 @@ -2.15.26 +2.15.27 Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon May 28 10:16:01 2007 @@ -512,12 +512,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -596,12 +590,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -754,10 +742,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/control.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.xml… ============================================================================== --- trunk/installation/control/control.xml (original) +++ trunk/installation/control/control.xml Mon May 28 10:16:01 2007 @@ -501,10 +501,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -573,10 +569,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> @@ -732,10 +724,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon May 28 10:16:01 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sun May 27 14:49:37 CEST 2007 - mzugec(a)suse.de + +- installation network changes: +http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.27 + +------------------------------------------------------------------- Tue May 22 10:51:57 CEST 2007 - ug(a)suse.de - reactivate hardware detection during autoinstall Modified: trunk/installation/src/clients/network_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/network… ============================================================================== --- trunk/installation/src/clients/network_finish.ycp (original) +++ trunk/installation/src/clients/network_finish.ycp Mon May 28 10:16:01 2007 @@ -48,19 +48,18 @@ } else if (func == "Write") { - if (Linuxrc::display_ip () || Linuxrc::vnc () || Linuxrc::usessh ()) + + // if network running, write network configuration + map output = (map)SCR::Execute(.target.bash_output, + "([ $(ip addr|grep -v '127.0.0.1'|grep -c inet) != '0' ] && echo 'network') || echo 'no net'"); + if (issubstring(output["stdout"]:"", "network")) { - y2milestone("Creating network interface"); - WFM::Execute (.local.bash, - "/sbin/create_interface '" + String::Quote (Installation::destdir) + "'"); + y2milestone("Save network configuration"); + WFM::CallFunction ("save_network"); ModulesConf::RunDepmod (false); + + } - // -------------------------------------------------------------- - // Copy DHCP client cache so that we can request the same IP (#43974). - WFM::Execute (.local.bash, sformat ( - "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", - "/var/lib/dhcpcd", - String::Quote (Installation::destdir))); } else { Modified: trunk/installation/startup/Second-Stage/S07-medium URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/Second-Stag… ============================================================================== --- trunk/installation/startup/Second-Stage/S07-medium (original) +++ trunk/installation/startup/Second-Stage/S07-medium Mon May 28 10:16:01 2007 @@ -1,5 +1,5 @@ #!/bin/sh -log "Starting S08-medium..." +log "Starting S07-medium..." log "======================" #============================================= @@ -7,43 +7,36 @@ #--------------------------------------------- Y2_NETWORK_ACTIVE=0 Y2_SSH_ACTIVE=0 -USE_SSH=0 -VNC=0 log "\tChecking kernel commandline..." #============================================= # 11.1 start shell on second virtual console #--------------------------------------------- if ! got_install_param '^NoShell:.*1' ; then - log "\tGot kernel parameter <NoShell> -> start shell on tty2" - SPID=`/usr/lib/YaST2/bin/startshell /dev/tty2` + log "\tGot kernel parameter <NoShell> -> start shell on tty2" + SPID=`/usr/lib/YaST2/bin/startshell /dev/tty2` fi + #============================================= -# 11.2) prepare for VNC installation +# 11.1) activate network if counfiguration found #--------------------------------------------- -if got_install_param '^VNC:.*1' ; then - log "\tGot kernel parameter VNC -> export VNC variable" - export VNC=1 +if [ ! -z $(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo') ] ;then + log "\tnetwork configuration found -> activate network" + rcnetwork start && Y2_NETWORK_ACTIVE=1 + +# firewall is started by rcnetwork +# rcSuSEfirewall2 reload + + +# if nfs:// is used for install source or add-on (reminder /var/lib/YaST2/network_install_portmap), +# start rcportmap + +[ -f /var/lib/YaST2/network_install_portmap ] && rcportmap start + fi -#============================================= -# 11.3) prepare for SSH installation -#--------------------------------------------- if got_install_param '^UseSSH:.*1' ; then log "\tGot kernel parameter UseSSH -> export UseSSH variable" - export USE_SSH=1 -fi -#============================================= -# 11.4) activate network for SSH, VNC, or remote X11 inst. -#--------------------------------------------- -if [ $VNC -eq 1 ] || [ $USE_SSH -eq 1 ] || [ -n "$Display_IP" ] ;then - log "\tVNC/SSH/remote X11 installation used -> activate network" - rcnetwork start && Y2_NETWORK_ACTIVE=1 - rcSuSEfirewall2 reload -fi -if [ $USE_SSH -eq 1 ];then rcsshd start && Y2_SSH_ACTIVE=1 fi log "\tSummary for commandline checks:" log "\tY2_NETWORK_ACTIVE = $Y2_NETWORK_ACTIVE" log "\tY2_SSH_ACTIVE = $Y2_SSH_ACTIVE" -log "\tUSE_SSH = $USE_SSH" -log "\tVNC = $VNC" -- 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] r38152 - /tags/stable-2_15_3/sysconfig/
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 07:22:52 2007 New Revision: 38152 URL: http://svn.opensuse.org/viewcvs/yast?rev=38152&view=rev Log: Created tag stable-2_15_3 for sysconfig Added: tags/stable-2_15_3/sysconfig/ - copied from r38151, trunk/sysconfig/ -- 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] r38151 - in /trunk/sysconfig: VERSION package/yast2-sysconfig.changes src/sysconfig.ycp src/wizards.ycp
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 07:21:56 2007 New Revision: 38151 URL: http://svn.opensuse.org/viewcvs/yast?rev=38151&view=rev Log: - check UID after evaluating command line arguments (#269909) - 2.15.3 Modified: trunk/sysconfig/VERSION trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/sysconfig.ycp trunk/sysconfig/src/wizards.ycp Modified: trunk/sysconfig/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/VERSION?rev=38151&r1=3… ============================================================================== --- trunk/sysconfig/VERSION (original) +++ trunk/sysconfig/VERSION Mon May 28 07:21:56 2007 @@ -1 +1 @@ -2.15.2 +2.15.3 Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfi… ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Mon May 28 07:21:56 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 28 07:16:57 CEST 2007 - lslezak(a)suse.cz + +- check UID after evaluating command line arguments (#269909) +- 2.15.3 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/sysconfig/src/sysconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/sysconfig.ycp?rev=… ============================================================================== --- trunk/sysconfig/src/sysconfig.ycp (original) +++ trunk/sysconfig/src/sysconfig.ycp Mon May 28 07:21:56 2007 @@ -23,7 +23,6 @@ import "Sysconfig"; import "CommandLine"; -import "Confirm"; include "sysconfig/wizards.ycp"; include "sysconfig/cmdline.ycp"; @@ -97,11 +96,6 @@ ] ]; -if (!Confirm::MustBeRoot()) -{ - return (any)`abort; -} - /* main ui function */ any ret = CommandLine::Run(cmdline); Modified: trunk/sysconfig/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/wizards.ycp?rev=38… ============================================================================== --- trunk/sysconfig/src/wizards.ycp (original) +++ trunk/sysconfig/src/wizards.ycp Mon May 28 07:21:56 2007 @@ -17,6 +17,7 @@ import "Popup"; import "Label"; import "Sequencer"; +import "Confirm"; include "sysconfig/complex.ycp"; include "sysconfig/dialogs.ycp"; @@ -65,6 +66,17 @@ return ret; } +define symbol CheckRoot() +{ + if (!Confirm::MustBeRoot()) + { + return `abort; + } + + return `next; +} + + /** * Whole configuration of sysconfig * @return sequence result @@ -72,13 +84,18 @@ define boolean SysconfigSequence() ``{ map aliases = $[ + "check" : [ ``( CheckRoot() ), true ], "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainSequence() ), "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ - "ws_start" : "read", + "ws_start" : "check", + "check" : $[ + `next : "read", + `abort : `abort + ], "read" : $[ `abort : `abort, `next : "main" -- 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] r38150 - in /trunk/ncurses/src/pkg: NCPackageSelector.cc NCPkgNames.cc NCPkgNames.h
by kmachalkova＠svn.opensuse.org 25 May '07

25 May '07

Author: kmachalkova Date: Fri May 25 17:18:13 2007 New Revision: 38150 URL: http://svn.opensuse.org/viewcvs/yast?rev=38150&view=rev Log: Fix disappearing 'Etc./All Packages List' submenu after unchecking AutoDependency Check Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPkgNames.cc trunk/ncurses/src/pkg/NCPkgNames.h Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Fri May 25 17:18:13 2007 @@ -1589,23 +1589,18 @@ "`MenuButton( \"%s\", [" "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," "`item( `id(\"testcase\"), \"%s\" )" -#ifdef FIXME "," - "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" -#endif + "`menu( \"%s\", [`item( `id(\"export\"), \"%s\" ), `item( `id(\"import\"), \"%s\" ) ] )" "] )", NCPkgNames::MenuEtc().c_str(), NCPkgNames::MenuDeps().c_str(), NCPkgNames::MenuCheckDeps().c_str(), NCPkgNames::MenuNoAutoDeps().c_str(), NCPkgNames::MenuVerifySystem().c_str(), - NCPkgNames::MenuTestCase().c_str() -#ifdef FIXME - , - NCPkgNames::MenuSel().c_str(), - NCPkgNames::MenuSaveSel().c_str(), - NCPkgNames::MenuLoadSel().c_str() -#endif + NCPkgNames::MenuTestCase().c_str(), + NCPkgNames::MenuList().c_str(), + NCPkgNames::MenuExportList().c_str(), + NCPkgNames::MenuImportList().c_str() ); @@ -1628,23 +1623,18 @@ "`MenuButton( \"%s\", [" "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," "`item( `id(\"testcase\"), \"%s\" )" -#ifdef FIXME "," - "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" -#endif + "`menu( \"%s\", [`item( `id(\"export\"), \"%s\" ), `item( `id(\"import\"), \"%s\" ) ] )" "] )", NCPkgNames::MenuEtc().c_str(), NCPkgNames::MenuDeps().c_str(), NCPkgNames::MenuCheckDeps().c_str(), NCPkgNames::MenuAutoDeps().c_str(), NCPkgNames::MenuVerifySystem().c_str(), - NCPkgNames::MenuTestCase().c_str() -#ifdef FIXME - , - NCPkgNames::MenuSel().c_str(), - NCPkgNames::MenuSaveSel().c_str(), - NCPkgNames::MenuLoadSel().c_str() -#endif + NCPkgNames::MenuTestCase().c_str(), + NCPkgNames::MenuList().c_str(), + NCPkgNames::MenuExportList().c_str(), + NCPkgNames::MenuImportList().c_str() ); Modified: trunk/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.cc?re… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.cc (original) +++ trunk/ncurses/src/pkg/NCPkgNames.cc Fri May 25 17:18:13 2007 @@ -1339,24 +1339,24 @@ return value; } -const string NCPkgNames::MenuSel() +const string NCPkgNames::MenuList() { // submenu: selections - static const string value = _( "&Selections" ); + static const string value = _( "All &Packages List" ); return value; } -const string NCPkgNames::MenuSaveSel() +const string NCPkgNames::MenuExportList() { // menu entry - static const string value = _( "S&ave Selection" ); + static const string value = _( "&Export to File" ); return value; } -const string NCPkgNames::MenuLoadSel() +const string NCPkgNames::MenuImportList() { // last menu entry of the Etc. menu - static const string value = _( "&Load Selection" ); + static const string value = _( "&Import from File" ); return value; } Modified: trunk/ncurses/src/pkg/NCPkgNames.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.h?rev… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.h (original) +++ trunk/ncurses/src/pkg/NCPkgNames.h Fri May 25 17:18:13 2007 @@ -879,9 +879,9 @@ static const string MenuNoAutoDeps(); static const string MenuVerifySystem(); static const string MenuTestCase(); - static const string MenuSel(); - static const string MenuSaveSel(); - static const string MenuLoadSel(); + static const string MenuList(); + static const string MenuExportList(); + static const string MenuImportList(); static const string MoreText(); static const string TabooText(); -- 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] r38149 - /tags/stable-2_15_14/online-update/
by jsuchome＠svn.opensuse.org 25 May '07

25 May '07

Author: jsuchome Date: Fri May 25 16:36:22 2007 New Revision: 38149 URL: http://svn.opensuse.org/viewcvs/yast?rev=38149&view=rev Log: Created tag stable-2_15_14 for online-update Added: tags/stable-2_15_14/online-update/ - copied from r38148, trunk/online-update/ -- 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] r38148 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/OnlineUpdateCallbacks.ycp
by jsuchome＠svn.opensuse.org 25 May '07

25 May '07

Author: jsuchome Date: Fri May 25 16:36:12 2007 New Revision: 38148 URL: http://svn.opensuse.org/viewcvs/yast?rev=38148&view=rev Log: - DonePackage and DoneProvide callbacks return "I" (#277351) - 2.15.14 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/OnlineUpdateCallbacks.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=38148&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Fri May 25 16:36:12 2007 @@ -1 +1 @@ -2.15.13 +2.15.14 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Fri May 25 16:36:12 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 25 16:12:47 CEST 2007 - jsuchome(a)suse.cz + +- DonePackage and DoneProvide callbacks return "I" (#277351) +- 2.15.14 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/online-update/src/OnlineUpdateCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdateCa… ============================================================================== --- trunk/online-update/src/OnlineUpdateCallbacks.ycp (original) +++ trunk/online-update/src/OnlineUpdateCallbacks.ycp Fri May 25 16:36:12 2007 @@ -31,7 +31,8 @@ */ global define boolean PatchProgressCallback (integer num) { - last_callback = "PatchProgressCallback"; + // do not save this one - we need to store Start/Done pairs + // last_callback = "PatchProgressCallback"; y2debug("PatchProgressCallback %1", num); @@ -161,7 +162,7 @@ */ global string DonePackage (integer error, string reason) { string ret = PackageCallbacks::DonePackage (error, reason); - if (ret == "") + if (ret == "I") { FinishLine (true); total_progress = total_progress + 1; @@ -182,7 +183,7 @@ */ global string DoneProvide (integer error, string reason, string name) { string ret = PackageCallbacks::DoneProvide (error, reason, name); - if (ret == "") + if (ret == "I") { if (last_callback == "StartProvide") FinishLine (false); -- 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] r38147 - in /trunk: add-on/package/ add-on/src/ autoinstallation/package/ autoinstallation/src/config/ backup/package/ backup/src/ bootloader/package/ bootloader/src/config/ control-center/package/...
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 13:39:58 2007 New Revision: 38147 URL: http://svn.opensuse.org/viewcvs/yast?rev=38147&view=rev Log: removed outdated translations from .desktop-files (#271209) Modified: trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/vendor.desktop trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/config/autoyast.desktop trunk/backup/package/yast2-backup.changes trunk/backup/src/backup.desktop trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/config/bootloader.desktop trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/YaST.desktop trunk/country/keyboard/src/keyboard.desktop trunk/country/language/src/yast-language.desktop trunk/country/package/yast2-country.changes trunk/dhcp-server/package/yast2-dhcp-server.changes trunk/firewall/package/yast2-firewall.changes trunk/firewall/src/firewall.desktop trunk/inetd/package/yast2-inetd.changes trunk/inetd/src/inetd.desktop trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/kerberos.desktop trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ldap.desktop trunk/ldap-server/package/yast2-ldap-server.changes trunk/ldap-server/src/ldap-server.desktop trunk/mail/package/yast2-mail.changes trunk/mail/src/mail.desktop trunk/metapackage/kdesu.desktop trunk/metapackage/package/yast2-metapackage-handler.changes trunk/metapackage/yast2.desktop trunk/mouse/package/yast2-mouse.changes trunk/mouse/src/mouse.desktop trunk/network/package/yast2-network.changes trunk/network/src/config/dns.desktop trunk/network/src/config/dsl.desktop trunk/network/src/config/host.desktop trunk/network/src/config/isdn.desktop trunk/network/src/config/lan.desktop trunk/network/src/config/modem.desktop trunk/network/src/config/network.desktop trunk/network/src/config/provider.desktop trunk/network/src/config/proxy.desktop trunk/network/src/config/routing.desktop trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/nfs.desktop trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/src/nfs_server.desktop trunk/nis-client/package/yast2-nis-client.changes trunk/nis-client/src/nis.desktop trunk/nis-server/package/yast2-nis-server.changes trunk/nis-server/src/nis_server.desktop trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/cd_update.desktop trunk/online-update/src/online_update.desktop trunk/packager/package/yast2-packager.changes trunk/packager/src/config/sw_single.desktop trunk/packager/src/config/sw_source.desktop trunk/phone-services/package/yast2-phone-services.changes trunk/phone-services/src/config/answering_machine.desktop trunk/phone-services/src/config/fax.desktop trunk/printer/package/yast2-printer.changes trunk/printer/src/config/printer.desktop trunk/profile-manager/package/yast2-profile-manager.changes trunk/profile-manager/src/profile-manager.desktop trunk/repair/package/yast2-repair.changes trunk/repair/src/bootmsg.desktop trunk/repair/src/messages.desktop trunk/repair/src/repair.desktop trunk/restore/package/yast2-restore.changes trunk/restore/src/restore.desktop trunk/runlevel/package/yast2-runlevel.changes trunk/runlevel/src/runlevel.desktop trunk/scanner/package/yast2-scanner.changes trunk/scanner/src/scanner.desktop trunk/security/package/yast2-security.changes trunk/security/src/security.desktop trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/joystick.desktop trunk/sound/sound/src/sound.desktop trunk/storage/controller/src/controller.desktop trunk/storage/disk/src/disk.desktop trunk/storage/lvm/src/lvm_config.desktop trunk/storage/package/yast2-storage.changes trunk/support/package/yast2-support.changes trunk/support/src/support.desktop trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/sysconfig.desktop trunk/tune/hwinfo/src/hwinfo.desktop trunk/tune/idedma/src/idedma.desktop trunk/tune/package/yast2-tune.changes trunk/tv/package/yast2-tv.changes trunk/tv/src/tv.desktop trunk/users/package/yast2-users.changes trunk/users/src/groups.desktop trunk/users/src/users.desktop trunk/x11/package/yast2-x11.changes trunk/x11/src/config/x11.desktop Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Mon May 14 09:07:40 CEST 2007 - jsrain(a)suse.cz - Fixed Add-Ons in AutoYaST Write function to Integrate all Add-Ons Modified: trunk/add-on/src/vendor.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/vendor.desktop?rev=38… ============================================================================== --- trunk/add-on/src/vendor.desktop (original) +++ trunk/add-on/src/vendor.desktop Fri May 25 13:39:58 2007 @@ -21,38 +21,4 @@ Name=Vendor Driver CD GenericName=Install a driver from a vendor-specific CD-ROM -Name[cs]=NaÄÃst CD s ovladaÄem od vÃ½robce -GenericName[cs]=Tento modul instaluje ovladaÄe tÅetÃch stran z CD od vÃ½robce. -Name[de]=Treiber-CD des HÃ¤ndlers laden -GenericName[de]=Dieses Modul dient dazu, keine SuSE-Treiber, sondern Treiber von einer Hersteller-spezifischen CD zu laden. -Name[es]=Cargar CD de controladores del fabricante -GenericName[es]=Este mÃ³dulo instala drivers no-SuSE desde un CD del fabricante. -Name[hu]=MeghajtÃ³-CD betÃ¶ltÃ©se -GenericName[hu]=Ez a modul egy nem SuSE-s meghajtÃ³t telepÃt, melyet a hardver gyÃ¡rtÃ³tÃ³l CD-ROM-on kapott. -Name[it]=Carica il CD dei driver del produttore -GenericName[it]=Questo modulo installa un driver non SuSE da un CD-ROM specifico del produttore. -Name[ko]=ì ì¡°ì¬ ëë¼ì´ë² CD ì ì¬ -GenericName[ko]=ì´ ëª¨ëì ì ì¡°ì¬ CD-ROMì¼ë¡ ë¶í° ìì¸ ëë¼ì´ë²ê° ìëê²ì ì¤ì¹í©ëë¤. -Name[nl]=Laadt de fabrikant's driver-CD -GenericName[nl]=Deze module installeert een niet-SuSE driver van een specifieke fabrikant CDROM. -Name[pt]=Carregar CD de driver do fabricante -GenericName[pt]=Este mÃ³dulo instala um driver nÃ£o-SuSE de um CD-ROM de fabricante. -Name[sk]=NaÄÃtaÅ¥ CD s ovlÃ¡daÄmi od vÃ½robcu -GenericName[sk]=Tento modul inÅ¡taluje ovlÃ¡daÄe z CD-ROM od vÃ½robcu. -Name[sv]=Ladda tillverkarens drivrutin-cd -GenericName[sv]=Den hÃ¤r modulen installerar en icke-SuSE-drivrutin frÃ¥n tillverkarens cd-skiva. -Name[bg]=ÐÐ°ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° CD Ð¾Ñ Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»Ñ -GenericName[bg]=Ð¢Ð¾Ð·Ð¸ Ð¼Ð¾Ð´ÑÐ» Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ° Ð½Ðµ-SuSE Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð¾Ñ CD Ð½Ð° Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»Ñ. -GenericName[da]=Dette modul installerer en ikke-SuSE driver fra en producentspecifik CD-ROM. -Name[el]=Î¦ÏÏÏÏÏÎ· CD Î¿Î´Î·Î³Î¿Ï ÎºÎ±ÏÎ±ÏÎºÎµÏÎ±ÏÏÎ® -GenericName[el]=ÎÏÏÎ® Î· Î¼Î¿Î½Î¬Î´Î± ÎµÎ³ÎºÎ±Î¸Î¹ÏÏÎ¬ ÎÎ½Î±Î½ Î¼Î·-SuSE Î¿Î´Î·Î³Ï Î±ÏÏ ÎÎ½Î± ÏÏÎ³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î¿ CD-ROM ÎºÎ±ÏÎ±ÏÎºÎµÏÎ±ÏÏÎ®. -Name[fr]= harger le CD pilote du constructeur -GenericName[fr]=Ce module installe le pilote d'un constructeur spÃ©cifique ne faisant pas partie de la distribution SuSE. -Name[ja]=ã¡ã¼ã«ã¼ã®ãã©ã¤ã CD ãèªã¿è¾¼ã -GenericName[ja]=ãã®ã¢ã¸ã¥ã¼ã«ã¯ SuSE ç¤¾è£½ä»¥å¤ã®ã¡ã¼ã«ã®ãã©ã¤ãããã®ã¡ã¼ã«ã¼ã® CD ããã¤ã³ã¹ãã¼ã«ãã¾ãã -GenericName[lt]=Å is modulis Ä¯diegia ne SuSE sukurtas tvarkykles iÅ¡ gamintojo CD-ROM'o. -GenericName[ru]=ÐÑÐ¾Ñ Ð¼Ð¾Ð´ÑÐ»Ñ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ Ð½Ðµ-SuSE Ð´ÑÐ°Ð¹Ð²ÐµÑÑ Ñ CD-Ð´Ð¸ÑÐºÐ¾Ð² Ð¿Ð¾ÑÑÐ°Ð²ÑÐ¸ÐºÐ¾Ð². -Name[sl]=NaloÅ¾i proizvajalÄev CD z gonilniki -GenericName[sl]=Modul namesti ne-SuSE gonilnik s CD-ROM-a proizvajalca. -GenericName[tr]=Bu modÃ¼l Ã¼reticiye Ã¶zel CD-ROM'dan SuSE sÃ¼rÃ¼cÃ¼sÃ¼ olmayan bir sÃ¼rÃ¼cÃ¼ kurulumu yapar X-KDE-SubstituteUID=true Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Tue May 22 10:57:06 CEST 2007 - ug(a)suse.de - reactivate hardware detection during autoinstall Modified: trunk/autoinstallation/src/config/autoyast.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/config/auto… ============================================================================== --- trunk/autoinstallation/src/config/autoyast.desktop (original) +++ trunk/autoinstallation/src/config/autoyast.desktop Fri May 25 13:39:58 2007 @@ -21,39 +21,4 @@ Name=Autoinstallation GenericName=Configuration system for autoinstallation -Name[cs]=AutomatickÃ¡ instalace -GenericName[cs]=KonfiguraÄnÃ systÃ©m pro automatickou instalaci -Name[de]=Automatische Installation -GenericName[de]=Konfigurationssystem fÃ¼r automatische Installation. -Name[es]=AutoinstalaciÃ³n -GenericName[es]=Sistema de configuraciÃ³n para la autoinstalaciÃ³n. -Name[hu]=Automatikus telepÃtÃ©s -GenericName[hu]=A rendszer elÅkÃ©szÃtÃ©se az automatikus telepÃtÃ©shez. -Name[it]=Installazione automatica -GenericName[it]=Sistema di configurazione per l'installazione automatica. -Name[ko]=ìëì¤ì¹ -GenericName[ko]=ìëì¤ì¹ë¥¼ ìí ìì¤í ì¤ì -Name[nl]=Automatische-installatie -GenericName[nl]=Automatische-installatie systeem configuratie. -Name[pt]=Auto-instalaÃ§Ã£o -GenericName[pt]=Sistema de ConfiguraÃ§Ã£o para Auto-instalaÃ§Ã£o. -Name[sk]=AutomatickÃ¡ inÅ¡talÃ¡cia -GenericName[sk]=KonfigurÃ¡cia systÃ©mu pre automatickÃº inÅ¡talÃ¡ciu. -Name[sv]=Automatisk installation -GenericName[sv]=InstÃ¤llningssystem fÃ¶r automatisk installation -GenericName[da]=Konfigurer system til autoinstallation -Name[el]=ÎÏÏÏÎ¼Î±ÏÎ·-ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· -GenericName[el]=Î ÏÎ¿ÎµÏÎ¿Î¹Î¼Î±ÏÎ¯Î± ÏÎ¿Ï Î£ÏÏÏÎ®Î¼Î±ÏÎ¿Ï Î³Î¹Î± ÎÏÏÏÎ¼Î±ÏÎ·-ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· -Name[fr]=Installation automatique -GenericName[fr]=SystÃ¨me de configuration pour l'installation automatique -Name[ja]=èªåã¤ã³ã¹ãã¼ã« -GenericName[ja]=èªåã¤ã³ã¹ãã¼ã«ããããã®è¨å®ã·ã¹ãã -Name[lt]=Automatinis diegimas -GenericName[lt]=Sistemos konfigÅ«ravimas automatiniam diegimui. -Name[ru]=ÐÐ²ÑÐ¾ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° -GenericName[ru]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¡Ð¸ÑÑÐµÐ¼Ñ Ð´Ð»Ñ ÐÐ²ÑÐ¾ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ -Name[sl]=Samodejna namestitev -GenericName[sl]=Konfiguracijski sistem za samodejno namestitev. -Name[tr]=Otomatik kurulum -GenericName[tr]=Otomatik kurulum iÃ§in sistem yapÄ±landÄ±rmasÄ± X-KDE-SubstituteUID=true Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Mar 28 10:28:09 CEST 2007 - mvidner(a)suse.cz - Do not repeatedly add archive extension if the file name contains Modified: trunk/backup/src/backup.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/backup.desktop?rev=38… ============================================================================== --- trunk/backup/src/backup.desktop (original) +++ trunk/backup/src/backup.desktop Fri May 25 13:39:58 2007 @@ -21,40 +21,4 @@ Name=System Backup GenericName=Back up files and system areas -Name[cs]=ZÃ¡loha systÃ©mu -GenericName[cs]=ZÃ¡lohujte si soubory a systÃ©movÃ© oblasti -Name[de]=Sicherungskopie der Systembereiche -GenericName[de]=Sicherung von Dateien und Systembereichen -Name[es]=Copia de seguridad del sistema -GenericName[es]=Hacer una copia de seguridad de archivos y zonas del sistema -Name[hu]=BiztonsÃ¡gi mentÃ©s -GenericName[hu]=FÃ¡jlok Ã©s rendszerterÃ¼let mentÃ©se -Name[it]=Backup del sistema -GenericName[it]=Effettua la copia di backup dei file e delle aree di sistema -Name[ko]=ìì¤í ë°±ì -GenericName[ko]=íì¼ê³¼ ìì¤í ììì ë°±ìí©ëë¤ -Name[nl]=Systeem backup -GenericName[nl]=Backup bestanden en systeemgebieden -Name[pt]=Salvamento do sistema -GenericName[pt]=Salvamento de arquivos e Ã¡reas de sistema -Name[sk]=ZÃ¡loha systÃ©mu -GenericName[sk]=ZÃ¡loha sÃºborov a systÃ©movÃ½ch oblastÃ -Name[sv]=SÃ¤kerhetskopiera system -GenericName[sv]=SÃ¤kerhetskopiera filer och systemomrÃ¥den -Name[da]=System sikkerhedskopi -GenericName[da]=SikkerhedskopiÃ©r filer og systemomrÃ¥der -Name[el]=ÎÎ½ÏÎ¯Î³ÏÎ±ÏÎ± ÎÏÎµÎ´ÏÎµÎ¯Î±Ï Î£ÏÏÏÎ®Î¼Î±ÏÎ¿Ï -GenericName[el]=ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± Î±Î½ÏÎ¹Î³ÏÎ¬ÏÏÎ½ ÎµÏÎµÎ´ÏÎµÎ¯Î±Ï Î³Î¹Î± Î±ÏÏÎµÎ¯Î± ÎºÎ±Î¹ ÏÎµÏÎ¹Î¿ÏÎ® ÏÏÏÏÎ®Î¼Î±ÏÎ¿Ï -Name[fr]=Sauvegarde du systÃ¨me -GenericName[fr]=Sauvegarde des fichiers et des zones systÃ¨me -Name[ja]=ã·ã¹ãã ã®ããã¯ã¢ãã -GenericName[ja]=ããã¯ã¢ããã®æ¦è¦ -Name[lt]=Sistemos atsarginÄs kopijos -GenericName[lt]=Daryti bylÅ³ ir sisteminiÅ³ sriÄiÅ³ atsargines kopijas -Name[ru]=Ð ÐµÐ·ÐµÑÐ²Ð½Ð¾Ðµ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ Ð¡Ð¸ÑÑÐµÐ¼Ñ -GenericName[ru]=Ð ÐµÐ·ÐµÑÐ²Ð½Ð¾Ðµ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÑ Ð¾Ð±Ð»Ð°ÑÑÐµÐ¹ -Name[sl]=Varnostna kopija sistema -GenericName[sl]=Varujte datoteke in sistemska podroÄja -Name[tr]=Sistem yedekleme -GenericName[tr]=DosyalarÄ± ve sistem alanÄ±nÄ± yedekle X-KDE-SubstituteUID=true Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Apr 11 19:14:30 CEST 2007 - aosthof(a)suse.de - Fixed erroneous EFI Bootloader Label (#242985) in BootELILO.ycp Modified: trunk/bootloader/src/config/bootloader.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/config/bootloader… ============================================================================== --- trunk/bootloader/src/config/bootloader.desktop (original) +++ trunk/bootloader/src/config/bootloader.desktop Fri May 25 13:39:58 2007 @@ -23,38 +23,4 @@ Name=Boot Loader GenericName=Configure the boot loader -Name[cs]=Konfigurace zavadÄÄe -GenericName[cs]=Konfigurace zavadÄÄe -Name[de]=Konfiguration des Bootloaders -GenericName[de]=Konfiguration des Bootloaders -Name[es]=ConfiguraciÃ³n del cargador de arranque -GenericName[es]=ConfiguraciÃ³n del cargador de arranque -Name[hu]=RendszertÃ¶ltÅ beÃ¡llÃtÃ¡sa -GenericName[hu]=RendszertÃ¶ltÅ beÃ¡llÃtÃ¡sa -Name[it]=Configurazione bootloader -GenericName[it]=Configurazione del bootloader -Name[ko]=ë¶í¸ ë¡ë ì¤ì -GenericName[ko]=ë¶í¸ ë¡ë ì¤ì -Name[nl]=Bootloader configuratie -GenericName[nl]=Bootloader configuratie -Name[pt]=ConfiguraÃ§Ã£o do Bootloader -GenericName[pt]=ConfiguraÃ§Ã£o do Bootloader -Name[sk]=SprÃ¡vca Å¡tartu -GenericName[sk]=SprÃ¡vca Å¡tartu -Name[sv]=StÃ¤ll in starthanterare -GenericName[sv]=StÃ¤ll in starthanterare -Name[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð·Ð°ÑÐµÐ¶Ð´Ð°Ð½ÐµÑÐ¾ Ð½Ð° ÐÐ¡ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð·Ð°ÑÐµÐ¶Ð´Ð°Ð½ÐµÑÐ¾ Ð½Ð° ÐÐ¡ -GenericName[da]=Konfiguration af opstartsindlÃ¦ser -Name[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÎ¿Ï Bootloader -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÎ¿Ï Bootloader -Name[fr]=Configuration du chargeur d'amorÃ§age -GenericName[fr]=Configuration du chargeur d'amorÃ§age -Name[ja]=ãã¼ãã»ãã¼ãã¼ã®è¨å® -GenericName[ja]=ãã¼ãããã¸ã£ã¼ã®è¨å® -GenericName[lt]=Ä®krovos tvarkyklÄs konfigÅ«racija -Name[sl]=Prilagoditev zagonskega nalagalnika -GenericName[sl]=Nastavitev zagonskega programa -Name[tr]=AÃ§Ä±lÄ±Å yÃ¼kleyici yapÄ±landÄ±rmasÄ± -GenericName[tr]=AÃ§Ä±lÄ±Å yÃ¼kleyicisi yapÄ±landÄ±rmasÄ± X-KDE-SubstituteUID=true Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Apr 25 14:21:39 CEST 2007 - sh(a)suse.de - Fixed desktop-file-validate complaints in YaST.desktop: Modified: trunk/control-center/src/YaST.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/YaST.desktop?… ============================================================================== --- trunk/control-center/src/YaST.desktop (original) +++ trunk/control-center/src/YaST.desktop Fri May 25 13:39:58 2007 @@ -3,7 +3,6 @@ Name=YaST Icon=yast GenericName=Control Center -GenericName[de]=Kontrollzentrum Exec=/sbin/yast2 X-KDE-SubstituteUID=true X-KDE-RootOnly=true Modified: trunk/country/keyboard/src/keyboard.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/keyboard.de… ============================================================================== --- trunk/country/keyboard/src/keyboard.desktop (original) +++ trunk/country/keyboard/src/keyboard.desktop Fri May 25 13:39:58 2007 @@ -23,39 +23,4 @@ Name=Keyboard Layout GenericName=Select the keyboard layout -Name[cs]=VÃ½bÄr rozloÅ¾enÃ klÃ¡vesnice -GenericName[cs]=Tento modul mÄnÃ rozvrÅ¾enÃ klÃ¡vesnice -Name[de]=Tastaturbelegung auswÃ¤hlen -GenericName[de]=Mit diesem Modul ist es mÃ¶glich, die Tastaturbelegung zu Ã¤ndern. -Name[es]=Seleccione la distribuciÃ³n del teclado -GenericName[es]=Este mÃ³dulo cambia la distribuciÃ³n del teclado -Name[hu]=BillentyÅ±kiosztÃ¡s beÃ¡llÃtÃ¡sa -GenericName[hu]=Ebben a modulban megvÃ¡ltoztathatja a beÃ¡llÃtott billentyÅ±zetkiosztÃ¡st -Name[it]=Selezionate la mappatura della tastiera -GenericName[it]=Questo modulo cambia la mappatura della tastiera -Name[ko]=í¤ë³´ë ë°°ì´ ì í -GenericName[ko]=ì´ ëª¨ëì í¤ë³´ë ë°°ì´ì ë³ê²½í©ëë¤ -Name[nl]=Selecteer toetsenbord layout -GenericName[nl]=Deze module verandert de toetsenbord layout -Name[pt]=Selecione o mapa do teclado -GenericName[pt]=Este mÃ³dulo modifica o mapa do teclado -Name[sk]=VÃ½ber klÃ¡vesnice -GenericName[sk]=Tento modul menÃ typ klÃ¡vesnice -Name[sv]=VÃ¤lj tangentbordslayout -GenericName[sv]=Den hÃ¤r modulen Ã¤ndrar tangentbordslayout -Name[bg]=ÐÐ·Ð±Ð¾Ñ Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ½Ð° Ð¿Ð¾Ð´ÑÐµÐ´Ð±Ð° -GenericName[bg]=Ð¢Ð¾Ð·Ð¸ Ð¼Ð¾Ð´ÑÐ» Ð¿ÑÐ¾Ð¼ÐµÐ½Ñ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ½Ð°ÑÐ° Ð¿Ð¾Ð´ÑÐµÐ´Ð±Ð° -GenericName[da]=Dette modul Ã¦ndrer tastaturets layout -Name[el]=ÎÏÎ¹Î»ÎÎ¾ÏÎµ ÎÎ¹Î¬ÏÎ±Î¾Î· Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î¯Î¿Ï -GenericName[el]=ÎÏÏÏ Î· Î¼Î¿Î½Î¬Î´Î± Î±Î»Î»Î¬Î¶ÎµÎ¹ ÏÎ· Î´Î¹Î¬ÏÎ±Î¾Î· ÏÎ»Î·ÎºÏÏÎ¿Î»Î¿Î³Î¯Î¿Ï -Name[fr]=SÃ©lectionnez la disposition du clavier -GenericName[fr]=Ce module change la disposition du clavier -Name[ja]=ãã¼ãã¼ãéåã®é¸æ -GenericName[ja]=ãã®ã¢ã¸ã¥ã¼ã«ã§ããã¼ãã¼ãéåã®å¤æ´ãã§ãã¾ãã -GenericName[lt]=Å is modulis pakeiÄia klaviatÅ«ros iÅ¡dÄstymÄ -GenericName[ru]=ÐÑÐ¾Ñ Ð¼Ð¾Ð´ÑÐ»Ñ Ð¸Ð·Ð¼ÐµÐ½ÑÐµÑ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÑ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ -Name[sl]=Izberite razpored tipkovnice -GenericName[sl]=Ta modul spremeni razpored tipkovnice -Name[tr]=Klavye dÃ¼zeni seÃ§in -GenericName[tr]=Bu modÃ¼l klavye dÃ¼zenini deÄiÅtirir X-KDE-SubstituteUID=true Modified: trunk/country/language/src/yast-language.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/yast-langua… ============================================================================== --- trunk/country/language/src/yast-language.desktop (original) +++ trunk/country/language/src/yast-language.desktop Fri May 25 13:39:58 2007 @@ -24,39 +24,4 @@ Name=Language GenericName=Change the language and install additional languages -Name[cs]=VÃ½bÄr jazyka -GenericName[cs]=Zde mÅ¯Å¾ete zmÄnit systÃ©movÃ½ jazyk. -Name[de]=Sprache wÃ¤hlen -GenericName[de]=Hier kÃ¶nnen Sie die Sprache des Systems umschalten. -Name[es]=Seleccione el idioma -GenericName[es]=AquÃ puede cambiar el idioma del sistema. -Name[hu]=Nyelv beÃ¡llÃtÃ¡sa -GenericName[hu]=A rendszerben hasznÃ¡lt nyelvet itt vÃ¡ltoztathatja meg. -Name[it]=Scegliete la lingua -GenericName[it]=Qui potete cambiare la lingua del sistema. -Name[ko]=ì¸ì´ ì í -GenericName[ko]=ì¬ê¸°ì ìì¤í ì¸ì´ë¥¼ ë³ê²½íìì¤ -Name[nl]=Kies een taal -GenericName[nl]=Wijzig hier de taal van het systeem. -Name[pt]=Escolha o Idioma -GenericName[pt]=Modifique o Idioma do sistema aqui. -Name[sk]=VÃ½ber jazyka -GenericName[sk]=ZmeniÅ¥ jazyk systÃ©mu. -Name[sv]=VÃ¤lj sprÃ¥k -GenericName[sv]=HÃ¤r kan du Ã¤ndra systemets sprÃ¥k -Name[bg]=ÐÐ·Ð±Ð¸ÑÐ°Ð½Ðµ Ð½Ð° ÐµÐ·Ð¸Ðº -GenericName[bg]=Ð¢ÑÐº Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ ÐµÐ·Ð¸ÐºÐ° Ð·Ð° ÑÑÐ»Ð°ÑÐ° ÑÐ¸ÑÑÐµÐ¼Ð°. -GenericName[da]=Skift systemets sprog her. -Name[el]=ÎÏÎ¹Î»Î¿Î³Î® ÎÎ»ÏÏÏÎ±Ï -GenericName[el]=ÎÎ»Î»Î¬Î¾ÏÎµ ÏÎ·Î½ Î³Î»ÏÏÏÎ± ÏÏÏÏÎ®Î¼Î±ÏÏÏ ÏÎ±Ï ÎµÎ´Ï. -Name[fr]=SÃ©lectionnez la langue -GenericName[fr]=Changez ici la langue du systÃ¨me. -Name[ja]=è¨èªã®é¸æ -GenericName[ja]=ããã§ãã·ã¹ãã ã®è¨èªã®å¤æ´ãã§ãã¾ãã -GenericName[lt]=Äia pakeiskite sistemos kalbÄ. -GenericName[ru]=ÐÐ´ÐµÑÑ Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ·ÑÐº ÑÐ¸ÑÑÐµÐ¼Ñ. -Name[sl]=Izberite jezik -GenericName[sl]=Tu zamenjajte sistemski jezik. -Name[tr]=Dil seÃ§in -GenericName[tr]=Sistem dilini buradan deÄiÅtirin. X-KDE-SubstituteUID=true Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Apr 4 17:00:53 CEST 2007 - jsuchome(a)suse.cz - added support for Walloon language Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/package/yast2-dhcp-s… ============================================================================== --- trunk/dhcp-server/package/yast2-dhcp-server.changes (original) +++ trunk/dhcp-server/package/yast2-dhcp-server.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Tue May 15 14:02:35 CEST 2007 - kmachalkova(a)suse.cz - Dropped simple vs. expert UI mode support (ProductFeatures): Modified: trunk/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/package/yast2-firewall.… ============================================================================== --- trunk/firewall/package/yast2-firewall.changes (original) +++ trunk/firewall/package/yast2-firewall.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed May 16 12:09:01 CEST 2007 - locilka(a)suse.cz - Opening "service:sshd" (defined by package) instead "ssh" in the Modified: trunk/firewall/src/firewall.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/firewall.desktop?re… ============================================================================== --- trunk/firewall/src/firewall.desktop (original) +++ trunk/firewall/src/firewall.desktop Fri May 25 13:39:58 2007 @@ -23,28 +23,4 @@ Name=Firewall GenericName=Configure a firewall -GenericName[cs]=NastavenÃ firewallu pro pokroÄilÃ© uÅ¾ivatele -GenericName[de]=Firewallkonfiguration fÃ¼r fortgeschrittene Anwender -Name[es]=Cortafuegos -GenericName[es]=ConfiguraciÃ³n del cortafuegos para usuarios avanzados -Name[hu]=TÅ±zfal -GenericName[hu]=A tÅ±zfal szakÃ©rtÅi beÃ¡llÃtÃ¡sa -GenericName[it]=Impostazione firewall per gli utenti esperti -Name[ko]=ë°©íë²½ -GenericName[ko]=ê³ ê¸ ì¬ì©ìë¥¼ ìí ë°©íë²½ ì¤ì -GenericName[nl]=Firewall instelling voor geavanceerde gebruikers -GenericName[pt]=ConfiguraÃ§Ã£o de Firewall para usuÃ¡rios avanÃ§ados -GenericName[sk]=Nastavenie firewallu pre pokroÄilÃ½ch pouÅ¾ÃvateÄ¾ov -Name[sv]=BrandvÃ¤gg -GenericName[sv]=BrandvÃ¤ggsinstÃ¤llningar fÃ¶r avancerade anvÃ¤ndare -GenericName[da]=BrandvÃ¦ggskonfiguration for avancerede brugere -GenericName[el]=ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Firewall Î³Î¹Î± ÏÏÎ¿ÏÏÏÎ·Î¼ÎÎ½Î¿ÏÏ ÏÏÎ®ÏÏÎµÏ -GenericName[fr]=Configuration Firewall pour utilisateurs experts -Name[ja]=ãã¡ã¤ã¢ã¦ã©ã¼ã« -GenericName[ja]=ä¸ç´ã®ãã¡ã¤ã¢ã¦ã©ã¼ã«è¨å® -Name[lt]=UgniasienÄ -GenericName[lt]=UgniasienÄs konfigÅ«ravimas patyrusiems vartotojams -Name[sl]=PoÅ¾arni zid -GenericName[sl]=Nastavitve poÅ¾arnega zidu za napredne uporabnike -GenericName[tr]=Ä°leri kullanÄ±cÄ±lar iÃ§in firewall ayarlarÄ± X-KDE-SubstituteUID=true Modified: trunk/inetd/package/yast2-inetd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/package/yast2-inetd.change… ============================================================================== --- trunk/inetd/package/yast2-inetd.changes (original) +++ trunk/inetd/package/yast2-inetd.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Apr 25 15:22:14 CEST 2007 - locilka(a)suse.cz - Fixing inetd.rnc file (#242148), patch from ug(a)suse.de. Modified: trunk/inetd/src/inetd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/inetd.desktop?rev=3814… ============================================================================== --- trunk/inetd/src/inetd.desktop (original) +++ trunk/inetd/src/inetd.desktop Fri May 25 13:39:58 2007 @@ -23,34 +23,4 @@ Name=Network Services (xinetd) GenericName=Configure network services (xinetd) -Name[cs]=SÃÅ¥ovÃ© sluÅ¾by (xinetd) -GenericName[cs]=Konfigurovat sÃÅ¥ovÃ© sluÅ¾by (xinetd) -Name[de]=Netzwerkdienste (xinetd) -GenericName[de]=Netzwerkdienste konfigurieren (xinetd) -Name[es]=Servicios de red (xinetd) -GenericName[es]=Configurar servicios de red (xinetd) -Name[hu]=HÃ¡lÃ³zati szolgÃ¡ltatÃ¡sok (xinetd) -GenericName[hu]=HÃ¡lÃ³zati szolgÃ¡ltatÃ¡sok beÃ¡llÃtÃ¡sa (xinetd) -Name[it]=Servizi di rete (xinetd) -GenericName[it]=Configurazione dei servizi di rete (xinetd) -Name[ko]=ë¤í¸ìí¬ ìë¹ì¤ (xinetd) -GenericName[ko]=ë¤í¸ìí¬ ìë¹ì¤ë¤ ì¤ì (xinetd) -Name[nl]=Netwerk services (xinetd) -GenericName[nl]=Configureer netwerk services (xinetd) -Name[pt]=ServiÃ§os de rede (xinetd) -GenericName[pt]=Configure os serviÃ§os de rede (xinetd) -Name[sk]=SieÅ¥ovÃ© sluÅ¾by (xinetd) -GenericName[sk]=KonfigurÃ¡cia sieÅ¥ovÃ½ch sluÅ¾ieb (xinetd) -Name[sv]=NÃ¤tverkstjÃ¤nster (xinetd) -GenericName[sv]=StÃ¤ll in nÃ¤tverkstjÃ¤nster (xinetd) -Name[el]=Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ ÎÎ¹ÎºÏÏÎ¿Ï (xinetd) -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÏÎµ ÏÎ¹Ï Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ ÎÎ¹ÎºÏÏÎ¿Ï (xinetd) -Name[fr]=Services rÃ©seau (xinetd) -GenericName[fr]=Configurer les services rÃ©seau (xinetd) -Name[ja]=ãããã¯ã¼ã¯ã»ãµã¼ãã¹ (xinetd) -GenericName[ja]=ãããã¯ã¼ã¯ã»ãµã¼ãã¹ã®è¨å® (xinetd) -Name[lt]=Tinklo paslaugos (xinetd) -Name[sl]=MreÅ¾ne storitve (xinetd) -GenericName[sl]=Nastavi MreÅ¾ne Storitve (xinetd) -Name[tr]=AÄ servisleri (xinetd) X-KDE-SubstituteUID=true Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Fri Mar 30 12:52:51 CEST 2007 - jsuchome(a)suse.cz - correct using of krb5.conf file sections during write (#258840) Modified: trunk/kerberos-client/src/kerberos.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/kerberos.des… ============================================================================== --- trunk/kerberos-client/src/kerberos.desktop (original) +++ trunk/kerberos-client/src/kerberos.desktop Fri May 25 13:39:58 2007 @@ -25,35 +25,4 @@ Name=Kerberos Client GenericName=Configure a Kerberos client -Name[cs]=Klient Kerberos -GenericName[cs]=Konfigurovat Kerberos klienta -Name[de]=Kerberos-Client -GenericName[de]=Konfiguration eines Kerberos-Client -Name[es]=Cliente Kerberos -GenericName[es]=Configurar un cliente Kerberos -Name[hu]=Kerberos kliens -GenericName[hu]=ÃllÃtson be Kerberos klienst -Name[it]=Client Kerberos -GenericName[it]=Configura un client Kerberos -Name[ko]=Kerberos í´ë¼ì´ì¸í¸ -GenericName[ko]=Kerberos í´ë¼ì´ì¸í¸ ì¤ì -Name[nl]=Kerberos cliÃ«nt -GenericName[nl]=Configureer een Kerberos cliÃ«nt -Name[pt]=Cliente Kerberos -GenericName[pt]=Configurar cliente Kerberos -Name[sk]=Klient Kerberos -GenericName[sk]=KonfigurÃ¡cia klienta Kerberos -Name[sv]=Kerberos-klient -GenericName[sv]=StÃ¤ll in en Kerberos-klient -Name[el]=Î ÎµÎ»Î¬ÏÎ·Ï Kerberos -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÎµÏÎµ ÎÎ½Î±Î½ Î ÎµÎ»Î¬ÏÎ· Kerberos -Name[fr]=Client Kerberos -GenericName[fr]=Configurer un client Kerberos -Name[ja]=Kerberos ã¯ã©ã¤ã¢ã³ã -GenericName[ja]=Kerberos ã¯ã©ã¤ã¢ã³ããè¨å®ãã -Name[lt]=Kerberos klientas -GenericName[lt]=KonfigÅ«ruoti Kerberos klientÄ -Name[sl]=Kerberos odjemalec -GenericName[sl]=Nastavite Kerberos odjemalca -GenericName[tr]=Bir Kerberos suncusunu yapÄ±landÄ±rÄ±n X-KDE-SubstituteUID=true Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed May 23 09:50:50 CEST 2007 - jsuchome(a)suse.cz - added LDAPInitWithTLSCheck function to offer fallback to uncrypted Modified: trunk/ldap-client/src/ldap.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap.desktop?rev… ============================================================================== --- trunk/ldap-client/src/ldap.desktop (original) +++ trunk/ldap-client/src/ldap.desktop Fri May 25 13:39:58 2007 @@ -24,38 +24,4 @@ Name=LDAP Client GenericName=Configure the LDAP client -Name[cs]=Klient LDAP -GenericName[cs]=Nastavit klienta LDAP -Name[de]=LDAP-Client -GenericName[de]=LDAP-Client konfigurieren -Name[es]=Cliente LDAP -GenericName[es]=Configurar cliente LDAP -Name[hu]=LDAP kliens -GenericName[hu]=Az LDAP kliens beÃ¡llÃtÃ¡sa -Name[it]=Client LDAP -GenericName[it]=Configura il client LDAP -Name[ko]=LDAP í´ë¼ì´ì¸í¸ -GenericName[ko]=LDAP í´ë¼ì´ì¸í¸ ì¤ì -Name[nl]=LDAP cliÃ«nt -GenericName[nl]=Configureer LDAP cliÃ«nt -Name[pt]=Cliente LDAP -GenericName[pt]=Configure o cliente LDAP -Name[sk]=LDAP klient -GenericName[sk]=KonfigurovaÅ¥ LDAP klienta -Name[sv]=LDAP-klient -GenericName[sv]=StÃ¤ll in LDAP-klient -Name[da]=LDAP-klient -GenericName[da]=KonfigurÃ©r LDAP-klient -Name[el]=Î ÎµÎ»Î¬ÏÎ·Ï LDAP -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÎµÎ»Î¬ÏÎ· LDAP -Name[fr]=Client LDAP -GenericName[fr]=Configurer le client LDAP -Name[ja]=LDAP ã¯ã©ã¤ã¢ã³ã -GenericName[ja]=LDAP ã¯ã©ã¤ã¢ã³ãã®è¨å® -Name[lt]=LDAP klientas -GenericName[lt]=KonfigÅ«ruoti LDAP klientÄ -Name[sl]=LDAP odjemalec -GenericName[sl]=Nastavi LDAP odjemalca -Name[tr]=LDAP istemcisi -GenericName[tr]=LDAP istemcisini yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Apr 11 10:36:03 CEST 2007 - rhafer(a)suse.de - Version 2.15.5 Modified: trunk/ldap-server/src/ldap-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server.desk… ============================================================================== --- trunk/ldap-server/src/ldap-server.desktop (original) +++ trunk/ldap-server/src/ldap-server.desktop Fri May 25 13:39:58 2007 @@ -24,6 +24,4 @@ Name=LDAP Server GenericName=Configure an LDAP Server -Name[de]=LDAP-Server -GenericName[de]=LDAP-Server konfigurieren X-KDE-SubstituteUID=true 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 Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Tue May 8 17:30:29 CEST 2007 - varkoly(a)suse.de - Move MailTableInclude.pm MailTable.pm to yast2. Modified: trunk/mail/src/mail.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.desktop?rev=38147&… ============================================================================== --- trunk/mail/src/mail.desktop (original) +++ trunk/mail/src/mail.desktop Fri May 25 13:39:58 2007 @@ -22,33 +22,4 @@ Name=Mail Transfer Agent GenericName=Configure mail -Name[cs]=Agent pÅenosu poÅ¡ty (MTA) -GenericName[cs]=Konfigurovat poÅ¡tu -GenericName[de]=Mailkonfiguration -Name[es]=Agente de transferencia de mensajes (MTA) -GenericName[es]=Configurar correo -Name[hu]=LevÃ©ltovÃ¡bbÃtÃ³ szerver (Mail Transfer Agent, MTA) -GenericName[hu]=LevelezÃ©s beÃ¡llÃtÃ¡sa -GenericName[it]=Configurazione posta -Name[ko]=ë©ì¼ ì ì¡ ìì´ì í¸ -GenericName[ko]=ë©ì¼ ì¤ì -GenericName[nl]=Configureer mail -Name[pt]=Servidor de Correio - MTA -GenericName[pt]=Configurar correio -GenericName[sk]=KonfigurovaÅ¥ poÅ¡tu -Name[sv]=ÃverfÃ¶ringsagent fÃ¶r e-post (MTA) -GenericName[sv]=StÃ¤ll in e-post -GenericName[da]=Indstil e-post -Name[el]=Î ÏÎ¬ÎºÏÎ¿ÏÎ±Ï ÎÎµÏÎ±ÏÎ¿ÏÎ¬Ï ÎÎ»Î»Î·Î»Î¿Î³ÏÎ±ÏÎ¯Î±Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· Î±Î»Î»Î·Î»Î¿Î³ÏÎ±ÏÎ¯Î±Ï -Name[fr]=Agent de transfert de mail -GenericName[fr]=Configurer le courrier -Name[ja]=ã¡ãã»ã¼ã¸è»¢éæ©è½ä½ -GenericName[ja]=é»åã¡ã¼ã«ãè¨å®ãã -Name[lt]=PaÅ¡to gabenimo agentas -GenericName[lt]=KonfigÅ«ruoti paÅ¡tÄ -Name[sl]=Posrednik za prenos poÅ¡te -GenericName[sl]=Konfiguriraj poÅ¡to -Name[tr]=Posta transfer yÃ¶neticisi -GenericName[tr]=Posta yapÄ±landÄ±rmasÄ± dÃ¼zenleyin X-KDE-SubstituteUID=true Modified: trunk/metapackage/kdesu.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/kdesu.desktop?rev=38… ============================================================================== --- trunk/metapackage/kdesu.desktop (original) +++ trunk/metapackage/kdesu.desktop Fri May 25 13:39:58 2007 @@ -1,14 +1,11 @@ [Desktop Entry] Comment= -Comment[en_GB]= Exec=kdesu yast2 MetaPackageHandler GenericName= -GenericName[en_GB]= Icon= InitialPreference=2 MimeType=text/ymp Name=kdesu -Name[en_GB]=kdesu Path= StartupNotify=true Terminal=false Modified: trunk/metapackage/package/yast2-metapackage-handler.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/package/yast2-metapa… ============================================================================== --- trunk/metapackage/package/yast2-metapackage-handler.changes (original) +++ trunk/metapackage/package/yast2-metapackage-handler.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu May 17 10:16:54 CEST 2007 - mvidner(a)suse.cz - Call the complex package selector in summary mode if there are Modified: trunk/metapackage/yast2.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/metapackage/yast2.desktop?rev=38… ============================================================================== --- trunk/metapackage/yast2.desktop (original) +++ trunk/metapackage/yast2.desktop Fri May 25 13:39:58 2007 @@ -1,14 +1,11 @@ [Desktop Entry] Comment= -Comment[en_GB]= Exec=/sbin/yast2 MetaPackageUrlHandler GenericName= -GenericName[en_GB]= Icon= InitialPreference=2 MimeType=text/ymu Name=yast2 -Name[en_GB]=yast2 Path= StartupNotify=true Terminal=false Modified: trunk/mouse/package/yast2-mouse.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/package/yast2-mouse.change… ============================================================================== --- trunk/mouse/package/yast2-mouse.changes (original) +++ trunk/mouse/package/yast2-mouse.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Tue Mar 13 10:12:26 CET 2007 - ms(a)suse.de - 2.15.1 Modified: trunk/mouse/src/mouse.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/mouse/src/mouse.desktop?rev=3814… ============================================================================== --- trunk/mouse/src/mouse.desktop (original) +++ trunk/mouse/src/mouse.desktop Fri May 25 13:39:58 2007 @@ -21,39 +21,4 @@ Name=Mouse Model GenericName=Change the mouse model -Name[cs]=Zvolte model myÅ¡i -GenericName[cs]=PouÅ¾ijte tento modul k vÃ½bÄru modelu myÅ¡i. -Name[de]=Mausmodell wÃ¤hlen -GenericName[de]=Verwenden Sie dieses Modul zum Wechseln des Mausmodells. -Name[es]=Seleccione el modelo de ratÃ³n -GenericName[es]=Use este mÃ³dulo para cambiar el modelo de su ratÃ³n. -Name[hu]=EgÃ©r -GenericName[hu]=Ez a modul az egÃ©r tÃpusÃ¡nak Ã¡tÃ¡llÃtÃ¡sÃ¡ra szolgÃ¡l. -Name[it]=Selezionate il modello di mouse -GenericName[it]=Usate questo modulo per cambiare il modello di mouse. -Name[ko]=ë§ì°ì¤ ëª¨ë¸ ì í -GenericName[ko]=ë§ì°ì¤ ì¢ë¥ë¥¼ ë³ê²½íë ¤ë©´ ì´ ëª¨ëì ì¬ì©íììì. -Name[nl]=Selecteer het muismodel -GenericName[nl]=Gebruik deze module om het muismodel te wijzigen. -Name[pt]=Selecione o modelo do mouse -GenericName[pt]=Use este mÃ³dulo para modificar o modelo do mouse. -Name[sk]=Vyberte model myÅ¡i -GenericName[sk]=PouÅ¾iÅ¥ tento modul na zmenu modelu myÅ¡i -Name[sv]=VÃ¤lj musmodell -GenericName[sv]=AnvÃ¤nd den hÃ¤r modulen fÃ¶r att Ã¤ndra musmodell. -Name[bg]=ÐÐ·Ð±Ð¾Ñ Ð½Ð° Ð¼Ð¾Ð´ÐµÐ» Ð½Ð° Ð¼Ð¸ÑÐºÐ°ÑÐ° -GenericName[bg]=ÐÐ·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹ÑÐµ ÑÐ¾Ð·Ð¸ Ð¼Ð¾Ð´ÑÐ» Ð·Ð° Ð´Ð° Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ Ð¼Ð¾Ð´ÐµÐ»Ð° Ð½Ð° Ð¼Ð¸ÑÐºÐ°ÑÐ°. -Name[da]=VÃ¦lg musemodel -GenericName[da]=Brug dette modul til at Ã¦ndre musemodel. -Name[el]=ÎÏÎ¹Î»ÎÎ¾ÏÎµ Î¼Î¿Î½ÏÎÎ»Î¿ ÏÎ¿Î½ÏÎ¹ÎºÎ¹Î¿Ï -GenericName[el]=Î§ÏÎ®ÏÎ· Î±ÏÏÎ®Ï ÏÎ·Ï Î¼Î¿Î½Î¬Î´Î±Ï Î³Î¹Î± ÏÎ·Î½ Î±Î»Î»Î±Î³Î® ÏÎ¿Ï Î¼Î¿Î½ÏÎÎ»Î¿Ï ÏÎ¿Ï ÏÎ¿Î½ÏÎ¹ÎºÎ¹Î¿Ï. -Name[fr]=SÃ©lectionner le modÃ¨le de souris -GenericName[fr]=Utiliser ce module pour changer le modÃ¨le de la souris. -Name[ja]=ãã¦ã¹ã®ã¢ãã«ãé¸æããã -GenericName[ja]=ãã®ã¢ã¸ã¥ã¼ã«ãä½¿ç¨ãã¦ããã¦ã¹ã®ã¢ãã«ãå¤æ´ã§ãã¾ãã -GenericName[lt]=Å Ä¯ modulÄ¯ naudokite pelÄs modelio pakeitimui. -GenericName[ru]=ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ ÑÑÐ¾Ñ Ð¼Ð¾Ð´ÑÐ»Ñ, ÑÑÐ¾Ð±Ñ Ð²ÑÐ±ÑÐ°ÑÑ Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¼ÑÑÐ¸. -Name[sl]=Izberite model miÅ¡ke -GenericName[sl]=Uporabite ta modul za zamenjavo modela miÅ¡ke. -GenericName[tr]=Fare modelini deÄiÅtirmek iÃ§in bu modÃ¼lÃ¼ kullanÄ±n. X-KDE-SubstituteUID=true Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Tue May 22 13:59:04 CEST 2007 - kmachalkova(a)suse.cz - Escape backslash characters in proxy auth credentials properly Modified: trunk/network/src/config/dns.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/dns.desktop?r… ============================================================================== --- trunk/network/src/config/dns.desktop (original) +++ trunk/network/src/config/dns.desktop Fri May 25 13:39:58 2007 @@ -21,39 +21,4 @@ Name=DNS and Hostname GenericName=Configure hostname and name servers -Name[cs]=DNS a jmÃ©no poÄÃtaÄe -GenericName[cs]=Konfigurovat jmÃ©no poÄÃtaÄe a DNS -Name[de]=DNS- und Hostname -GenericName[de]=Konfigurieren Sie Ihren Hostnamen und DNS -Name[es]=DNS y nombre de ordenador -GenericName[es]=Configurar nombre de ordenador y DNS -Name[hu]=DNS Ã©s gÃ©pnÃ©v -GenericName[hu]=A gÃ©pnÃ©v Ã©s a DNS beÃ¡llÃtÃ¡sa -Name[it]=Nome host e DNS -GenericName[it]=Configurazione nome host e DNS -Name[ko]= DNS ë° í¸ì¤í¸ ì´ë¦(&D) -GenericName[ko]=í¸ì¤í¸ ì´ë¦ê³¼ DNS ì¤ì -Name[nl]=DNS en hostnaam -GenericName[nl]=Configureer hostnaam en DNS -Name[pt]=Nome de Host e DNS -GenericName[pt]=Configurar nome de Host e DNS -Name[sk]=DNS a meno hostiteÄ¾a -GenericName[sk]=KonfigurÃ¡cia hostiteÄ¾a poÄÃtaÄa a DNS -Name[sv]=DNS och vÃ¤rddatornamn -GenericName[sv]=StÃ¤ll in vÃ¤rddatornamn och DNS -Name[bg]=DNS Ð¸ Ð¸Ð¼Ðµ Ð½Ð° Ð¼Ð°ÑÐ¸Ð½Ð°ÑÐ° -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð¸Ð¼ÐµÑÐ¾ Ð½Ð° Ð¼Ð°ÑÐ¸Ð½Ð°ÑÐ° Ð¸ DNS -GenericName[da]=Indstil vÃ¦rtsmaskinenavn og DNS -Name[el]=DNS ÎºÎ±Î¹ ÏÎ½Î¿Î¼Î± ÎÏÎ¼Î²Î¿Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÏÎµ ÏÎ¿ ÏÎ½Î¿Î¼Î± host ÎºÎ±Î¹ DNS. -Name[fr]=Nom d'hÃ´te et DNS -GenericName[fr]=Configurer nom d'hÃ´te et DNS -Name[ja]=DNS ã¨ãã¹ãå -GenericName[ja]=ãã¹ãåã¨ DNS ãè¨å®ãã -Name[lt]=DNS ir kompiuterio vardas -GenericName[lt]=KonfigÅ«ruoti kompiuterio vardÄ ir DNS -Name[sl]=DNS in ime gostitelja -GenericName[sl]=Nastavitev imena raÄunalnika in DNS-ja -Name[tr]=DNS ve ana makine adÄ± -GenericName[tr]=Ana makine adÄ±nÄ± ve DNS'i yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/network/src/config/dsl.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/dsl.desktop?r… ============================================================================== --- trunk/network/src/config/dsl.desktop (original) +++ trunk/network/src/config/dsl.desktop Fri May 25 13:39:58 2007 @@ -21,23 +21,4 @@ Name=DSL GenericName=Configure a DSL connection -GenericName[cs]=Konfigurovat DSL spojenÃ -GenericName[de]=Konfiguration der DSL-Verbindung -Name[es]=ADSL -GenericName[es]=Configurar conexiÃ³n ADSL -GenericName[hu]=DSL kapcsolat beÃ¡llÃtÃ¡sa -GenericName[it]=Configurazione connessione DSL -GenericName[ko]=DSL ì°ê²° ì¤ì -GenericName[nl]=Configureer DSL verbinding -GenericName[pt]=Configurar conexÃ£o DSL -GenericName[sk]=KonfigurÃ¡cia pripojenia DSL -GenericName[sv]=StÃ¤ll in DSL-anslutning -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° DSL Ð²ÑÑÐ·ÐºÐ° -GenericName[da]=Indstil DSL-tilslutning -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÏÎ½Î´ÎµÏÎ·Ï DSL -GenericName[fr]=Configurer la connexion DSL -GenericName[ja]=DSL æ¥ç¶ãè¨å®ãã -GenericName[lt]=KonfigÅ«ruoti DSL ryÅ¡Ä¯ -GenericName[sl]=Nastavitev DSL povezave -GenericName[tr]=DSL baÄlantÄ±sÄ±nÄ± yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/network/src/config/host.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/host.desktop?… ============================================================================== --- trunk/network/src/config/host.desktop (original) +++ trunk/network/src/config/host.desktop Fri May 25 13:39:58 2007 @@ -23,38 +23,4 @@ Name=Hostnames GenericName=Assign hostnames and aliases to IP addresses -Name[cs]=JmÃ©na poÄÃtaÄÅ¯ -GenericName[cs]=Konfigurovat jmÃ©na poÄÃtaÄÅ¯ -Name[de]=Hostnamen -GenericName[de]=Hostnamen konfigurieren -Name[es]=Nombres de ordenador -GenericName[es]=Configurar nombres de ordenador -Name[hu]=GÃ©pnevek -GenericName[hu]=GÃ©pnevek beÃ¡llÃtÃ¡sa -Name[it]=Nome host -GenericName[it]=Configura nomi degli host -Name[ko]=í¸ì¤í¸ ì´ë¦ -GenericName[ko]=í¸ì¤í¸ ì´ë¦ ì¤ì -Name[nl]=Hostnamen -GenericName[nl]=Configureer hostnamen -Name[pt]=Nomes de Host -GenericName[pt]=Configurar Nomes de Host -Name[sk]=MenÃ¡ hostiteÄ¾ov -GenericName[sk]=Nastavenie mien hostiteÄ¾ov -Name[sv]=VÃ¤rddatornamn -GenericName[sv]=StÃ¤ll in vÃ¤rddatornamn -Name[bg]=ÐÐ¼ÐµÐ½Ð° Ð½Ð° Ð¼Ð°ÑÐ¸Ð½Ð¸ÑÐµ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð¸Ð¼ÐµÐ½Ð°ÑÐ° Ð½Ð° Ð¼Ð°ÑÐ¸Ð½Ð¸ÑÐµ -Name[el]=ÎÎ½ÏÎ¼Î±ÏÎ± ÎÏÎ¼Î²Î¿Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· Î¿Î½Î¿Î¼Î¬ÏÏÎ½ ÎÏÎ¼Î²Î¿Ï -Name[fr]=Noms d'hÃ´te -GenericName[fr]=Configurer les noms d'hÃ´te -Name[ja]=ãã¹ãå -GenericName[ja]=ãã¹ãåãè¨å®ãã -Name[lt]=KompiuteriÅ³ vardai -GenericName[lt]=KonfigÅ«ruoti kompiuteriÅ³ vardus -Name[sl]=Imena gostiteljev -GenericName[sl]=Nastavite imena gostiteljev -Name[tr]=Ana makinalarÄ±n adÄ± -GenericName[tr]=Ana makine adlarÄ±nÄ± ayarla X-KDE-SubstituteUID=true Modified: trunk/network/src/config/isdn.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/isdn.desktop?… ============================================================================== --- trunk/network/src/config/isdn.desktop (original) +++ trunk/network/src/config/isdn.desktop Fri May 25 13:39:58 2007 @@ -21,25 +21,4 @@ Name=ISDN GenericName=Configure an ISDN connection -GenericName[cs]=Konfigurovat ISDN spojenÃ -GenericName[de]=Konfiguration der ISDN-Verbindung -Name[es]=RDSI -GenericName[es]=Configurar conexiÃ³n RDSI -GenericName[hu]=ISDN beÃ¡llÃtÃ¡sa -GenericName[it]=Configurazione connessione ISDN -GenericName[ko]=ISDN ì°ê²°ì¤ì -GenericName[nl]=Configureer ISDN verbinding -Name[pt]=RDSI (ISDN) -GenericName[pt]=Configurar conexÃ£o RDSI (ISDN) -GenericName[sk]=KonfigurÃ¡cia pripojenia ISDN -GenericName[sv]=StÃ¤ll in ISDN-anslutning -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ISDN Ð²ÑÑÐ·ÐºÐ° -GenericName[da]=Indstil ISDN-tilslutning -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÏÎ½Î´ÎµÏÎ·Ï ISDN -Name[fr]=ISDN (RNIS) -GenericName[fr]=Configurer la connexion ISDN (RNIS) -GenericName[ja]=ISDN æ¥ç¶ãè¨å®ãã -GenericName[lt]=KonfigÅ«ruoti ISDN ryÅ¡Ä¯ -GenericName[sl]=Nastavitev ISDN povezave -GenericName[tr]=ISDN baÄlantÄ±sÄ±nÄ± yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/network/src/config/lan.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/lan.desktop?r… ============================================================================== --- trunk/network/src/config/lan.desktop (original) +++ trunk/network/src/config/lan.desktop Fri May 25 13:39:58 2007 @@ -23,41 +23,4 @@ Name=Network Card GenericName=Configure network cards -Name[cs]=SÃÅ¥ovÃ¡ karta -GenericName[cs]=Konfigurovat sÃÅ¥ovou kartu -Name[de]=Netzwerkkarte -GenericName[de]=Konfiguration der Netzwerkkarte -Name[en]=Network Card -Name[es]=Tarjeta de red -GenericName[es]=Configurar tarjeta de red -Name[hu]=HÃ¡lÃ³zati kÃ¡rtya -GenericName[hu]=HÃ¡lÃ³zati kÃ¡rtya beÃ¡llÃtÃ¡sa -Name[it]=Scheda di rete -GenericName[it]=Configurazione scheda di rete -Name[ko]=ë¤í¸ìí¬ ì¹´ë -GenericName[ko]=ë¤í¸ìí¬ ì¹´ë ì¤ì -Name[nl]=Netwerkkaart -GenericName[nl]=Configureer netwerkkaart -Name[pt]=Placa de rede -GenericName[pt]=Configurar placa de rede -Name[sk]=SieÅ¥ovÃ¡ karta -GenericName[sk]=KonfigurÃ¡cia sieÅ¥ovej karty -Name[sv]=NÃ¤tverkskort -GenericName[sv]=StÃ¤ll in nÃ¤tverkskort -Name[bg]=ÐÑÐµÐ¶Ð¾Ð²Ð° ÐºÐ°ÑÑÐ° -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð¼ÑÐµÐ¶Ð¾Ð²Ð° ÐºÐ°ÑÑÐ° -Name[da]=NetvÃ¦rkskort (NIC) -GenericName[da]=Indstil netvÃ¦rkskort -Name[el]=ÎÎ¬ÏÏÎ± Î´Î¹ÎºÏÏÎ¿Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÏÎµ ÏÎ·Î½ ÎºÎ¬ÏÏÎ± Î´Î¹ÎºÏÏÎ¿Ï -Name[fr]=Carte rÃ©seau -GenericName[fr]=Configurer la carte rÃ©seau. -Name[ja]=ãããã¯ã¼ã¯ã»ã«ã¼ã -GenericName[ja]=ãããã¯ã¼ã¯ã»ã«ã¼ããè¨å®ãã -Name[lt]=Tinklo plokÅ¡tÄ -GenericName[lt]=KonfigÅ«ruoti tinklo plokÅ¡tÄ -Name[sl]=OmreÅ¾na kartica -GenericName[sl]=Nastavite omreÅ¾no kartico -Name[tr]=AÄ kartÄ± -GenericName[tr]=AÄ kartÄ±nÄ± yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/network/src/config/modem.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/modem.desktop… ============================================================================== --- trunk/network/src/config/modem.desktop (original) +++ trunk/network/src/config/modem.desktop Fri May 25 13:39:58 2007 @@ -21,27 +21,4 @@ Name=Modem GenericName=Configure a modem -GenericName[cs]=Konfigurovat modem -GenericName[de]=Konfiguration des Modems -Name[es]=MÃ³dem -GenericName[es]=Configurar mÃ³dem -GenericName[hu]=A modem beÃ¡llÃtÃ¡sa -GenericName[it]=Configurazione modem -Name[ko]=ëª¨ë -GenericName[ko]=ëª¨ë ì¤ì -GenericName[nl]=Configureer modem -GenericName[pt]=Configurar modem -GenericName[sk]=KonfigurÃ¡cia modemu -GenericName[sv]=StÃ¤ll in modem -Name[bg]=ÐÐ¾Ð´ÐµÐ¼ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð¼Ð¾Ð´ÐµÐ¼ -GenericName[da]=Indstil modem -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÏÎµ ÏÎ¿ modem -GenericName[fr]=Configurer le modem -Name[ja]=ã¢ãã -GenericName[ja]=ã¢ãã ãè¨å®ãã -Name[lt]=Modemas -GenericName[lt]=KonfigÅ«ruoti modemÄ -GenericName[sl]=Nastavite modem -GenericName[tr]=Modemi yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/network/src/config/network.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/network.deskt… ============================================================================== --- trunk/network/src/config/network.desktop (original) +++ trunk/network/src/config/network.desktop Fri May 25 13:39:58 2007 @@ -21,38 +21,4 @@ Name=Expert Network Configuration GenericName=Configure network -Name[cs]=ExpertnÃ konfigurace sÃtÄ -GenericName[cs]=Konfigurovat sÃÅ¥ -Name[de]=Netzwerkkonfiguration fÃ¼r Experten -GenericName[de]=Netzwerk konfigurieren -Name[es]=ConfiguraciÃ³n avanzada de red -GenericName[es]=Configurar la red -Name[hu]=SzakÃ©rtÅ hÃ¡lÃ³zati beÃ¡llÃtÃ¡sok -GenericName[hu]=HÃ¡lÃ³zat beÃ¡llÃtÃ¡sa -Name[it]=Configurazione di rete per esperti -GenericName[it]=Configura la rete -Name[ko]=ì ë¬¸ê° ë¤í¸ìí¬ ì¤ì -GenericName[ko]=ë¤í¸ì ì¤ì -Name[nl]=Expert netwerk configuratie -GenericName[nl]=Configureer netwerk -Name[pt]=ConfiguraÃ§Ã£o rede Especialista -GenericName[pt]=Configurar rede -Name[sk]=ExpertnÃ© nastavenie siete -GenericName[sk]=NastaviÅ¥ sieÅ¥ -Name[sv]=ExpertinstÃ¤llningar av nÃ¤tverk -GenericName[sv]=StÃ¤ll in nÃ¤tverk -Name[bg]=ÐÐºÑÐ¿ÐµÑÑÐ½Ð° Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð¼ÑÐµÐ¶Ð°ÑÐ° -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð¼ÑÐµÐ¶Ð°ÑÐ° -Name[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÎÎ¹ÎºÏÏÎ¿Ï Î³Î¹Î± ÎÎ¹Î´Î¹ÎºÎ¿ÏÏ -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÎÎ¹ÎºÏÏÎ¿Ï -Name[fr]=Configuration rÃ©seau pour experts -GenericName[fr]=Configurer le rÃ©seau -Name[ja]=é«åº¦ãªãããã¯ã¼ã¯ã®è¨å® -GenericName[ja]=ãããã¯ã¼ã¯ãè¨å®ãã -Name[lt]=SudÄtinga tinklo konfigÅ«racija -GenericName[lt]=KonfigÅ«ruoti tinklÄ -Name[sl]=NaprednejÅ¡a nastavitev omreÅ¾ja -GenericName[sl]=Nastavite OmreÅ¾je -Name[tr]=Uzman aÄ yapÄ±landÄ±rmasÄ± -GenericName[tr]=AÄÄ± yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/network/src/config/provider.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/provider.desk… ============================================================================== --- trunk/network/src/config/provider.desktop (original) +++ trunk/network/src/config/provider.desktop Fri May 25 13:39:58 2007 @@ -21,37 +21,4 @@ Name=Providers GenericName=Configure providers -Name[cs]=PoskytovatelÃ© -GenericName[cs]=Konfigurovat poskytovatele -Name[de]=Provider -GenericName[de]=Provider konfigurieren -Name[es]=Proveedores -GenericName[es]=Configurar proveedores -Name[hu]=SzolgÃ¡ltatÃ³k -GenericName[hu]=SzolgÃ¡ltatÃ³k beÃ¡llÃtÃ¡sa -Name[it]=Provider -GenericName[it]=Configura i provider -Name[ko]=ìë¹ì¤ ì ê³µì -GenericName[ko]=ìë¹ì¤ ì ê³µì ì¤ì -GenericName[nl]=Configureer providers -Name[pt]=Provedores -GenericName[pt]=Configurar Provedores -Name[sk]=Poskytovatelia -GenericName[sk]=Nastavenie poskytovateÄ¾ov -Name[sv]=LeverantÃ¶rer -GenericName[sv]=StÃ¤ll in leverantÃ¶rer -Name[bg]=ÐÐ¾ÑÑÐ°Ð²ÑÐ¸ÑÐ¸ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð´Ð¾ÑÑÐ°Ð²ÑÐ¸ÑÐ¸ -Name[el]=Î Î±ÏÎ¿ÏÎµÎ¯Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· Î Î±ÏÎ¿ÏÎÏÎ½ -Name[fr]=Fournisseurs -GenericName[fr]=Configurer les founisseurs d'accÃ¨s -Name[ja]=ãããã¤ã -GenericName[ja]=ãããã¤ããè¨å®ãã -Name[lt]=TeikÄjai -GenericName[lt]=KonfigÅ«ruoti tiekÄjus -Name[sl]=Ponudniki -GenericName[sl]=Nastavite ponudnika -Name[tr]=Servis saÄlayÄ±cÄ±lar -GenericName[tr]=Servis saÄlayÄ±cÄ±larÄ± yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/network/src/config/proxy.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/proxy.desktop… ============================================================================== --- trunk/network/src/config/proxy.desktop (original) +++ trunk/network/src/config/proxy.desktop Fri May 25 13:39:58 2007 @@ -23,27 +23,4 @@ Name=Proxy GenericName=Configure a proxy -GenericName[cs]=Konfigurovat proxy -GenericName[de]=Proxy konfigurieren -GenericName[es]=Configurar proxy -GenericName[hu]=A proxy beÃ¡llÃtÃ¡sa -GenericName[it]=Configura proxy -Name[ko]=íë½ì -GenericName[ko]=íë½ì ì¤ì -GenericName[nl]=Configureer proxy -GenericName[pt]=Configurar proxy -GenericName[sk]=Nastavenie proxy -GenericName[sv]=StÃ¤ll in proxy -Name[bg]=ÐÑÐ¾ÐºÑÐ¸ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð¿ÑÐ¾ÐºÑÐ¸ -Name[el]=ÎÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· Î¼ÎµÏÎ¿Î»Î±Î²Î·ÏÎ® -GenericName[fr]=Configurer le proxy -Name[ja]=ãããã· -GenericName[ja]=ãããã·ã®è¨å® -Name[lt]=âProxyâ -GenericName[lt]=KonfigÅ«ruoti âproxyâ -Name[sl]=Namestnik (proxy) -GenericName[sl]=Nastavi namestnika (proxy) -GenericName[tr]=Proxy yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/network/src/config/routing.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/routing.deskt… ============================================================================== --- trunk/network/src/config/routing.desktop (original) +++ trunk/network/src/config/routing.desktop Fri May 25 13:39:58 2007 @@ -21,37 +21,4 @@ Name=Routing GenericName=Configure routing -Name[cs]=SmÄrovÃ¡nÃ -GenericName[cs]=Konfigurovat smÄrovÃ¡nÃ -GenericName[de]=Routing konfigurieren -Name[es]=Enrutado -GenericName[es]=Configurar enrutado -Name[hu]=ÃtvÃ¡lasztÃ¡s -GenericName[hu]=Az ÃºtvÃ¡lasztÃ¡s beÃ¡llÃtÃ¡sa -GenericName[it]=Configurazione routing -Name[ko]=ë¼ì°í -GenericName[ko]=ë¼ì°í ì¤ì -GenericName[nl]=Configureer routing -Name[pt]=Roteamento -GenericName[pt]=Configurar roteamento -Name[sk]=Smerovanie -GenericName[sk]=Nastavenie smerovania -GenericName[sv]=StÃ¤ll in routing -Name[bg]=Ð ÑÑÐ¸ÑÐ°Ð½Ðµ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ÑÑÑÐ¸ÑÐ°Ð½ÐµÑÐ¾ -GenericName[da]=Indstil routing -Name[el]=ÎÏÎ¿Î¼Î¿Î»ÏÎ³Î·ÏÎ· -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· Î´ÏÎ¿Î¼Î¿Î»ÏÎ³Î·ÏÎ·Ï -Name[fr]=Routage -GenericName[fr]=Configurer le routage -Name[ja]=ã«ã¼ãã£ã³ã° -GenericName[ja]=ã«ã¼ãã£ã³ã°ãè¨å®ãã -Name[lt]=MarÅ¡rutizacija -GenericName[lt]=KonfigÅ«ruoti marÅ¡rutus -Name[ru]=Ð Ð¾ÑÑÐ¸Ð½Ð³ -GenericName[ru]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° ÑÐ¾ÑÑÐ¸Ð½Ð³Ð° -Name[sl]=Usmerjanje -GenericName[sl]=Nastavite usmerjanje -Name[tr]=YÃ¶nlendirme -GenericName[tr]=YÃ¶nlendirmeyi yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Mon Nov 20 14:46:48 CET 2006 - mvidner(a)suse.cz - Have all yast packages with 2.14.x in OS-10.2. Modified: trunk/nfs-client/src/nfs.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/nfs.desktop?rev=3… ============================================================================== --- trunk/nfs-client/src/nfs.desktop (original) +++ trunk/nfs-client/src/nfs.desktop Fri May 25 13:39:58 2007 @@ -25,38 +25,4 @@ Name=NFS Client GenericName=Configure an NFS client -Name[cs]=Klient NFS -GenericName[cs]=Konfigurovat klient NFS -Name[de]=NFS-Client -GenericName[de]=Konfiguration des NFS-Clients -Name[es]=Cliente NFS -GenericName[es]=Configurar el cliente NFS -Name[hu]=NFS kliens -GenericName[hu]=Az NFS kliens beÃ¡llÃtÃ¡sa -Name[it]=Client NFS -GenericName[it]=Configura il client NFS. -Name[ko]=NFS í´ë¼ì´ì¸í¸ -GenericName[ko]=NFS í´ë¼ì´ì¸í¸ ì¤ì -Name[nl]=NFS cliÃ«nt -GenericName[nl]=Configureer NFS cliÃ«nt. -Name[pt]=Cliente NFS -GenericName[pt]=Configurar cliente NFS. -Name[sk]=Klient NFS -GenericName[sk]=KonfigurÃ¡cia klienta NFS -Name[sv]=NFS-klient -GenericName[sv]=StÃ¤ll in NFS-klient -Name[bg]=NFS ÐºÐ»Ð¸ÐµÐ½Ñ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° NFS ÐºÐ»Ð¸ÐµÐ½ÑÐ°. -GenericName[da]=KonfigurÃ©r NFS-klient. -Name[el]=Î ÎµÎ»Î¬ÏÎ·Ï NFS -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÏÎµ ÏÎ¿Î½ ÏÎµÎ»Î¬ÏÎ· NFS. -Name[fr]=Client NFS -GenericName[fr]=Configuration du client NFS. -Name[ja]=NFS ã¯ã©ã¤ã¢ã³ã -GenericName[ja]=NFS ã¯ã©ã¤ã¢ã³ãã®è¨å® -GenericName[lt]=KonfigÅ«ruoti NFS klientÄ. -GenericName[ru]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° NFS-ÐºÐ»Ð¸ÐµÐ½ÑÐ° -Name[sl]=Odjemalec NFS -GenericName[sl]=Nastavitev NFS odjemalca -GenericName[tr]=NFS istemcisini yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-ser… ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Mar 14 12:02:13 IST 2007 - pchakravarthi(a)novell.com - Added CLI for setting parameters related to NFSv4 server. Modified: trunk/nfs-server/src/nfs_server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/nfs_server.deskto… ============================================================================== --- trunk/nfs-server/src/nfs_server.desktop (original) +++ trunk/nfs-server/src/nfs_server.desktop Fri May 25 13:39:58 2007 @@ -23,38 +23,4 @@ Name=NFS Server GenericName=Configure an NFS server -Name[cs]=NFS server -GenericName[cs]=Konfigurovat NFS server. -Name[de]=NFS-Server -GenericName[de]=Konfiguration des NFS-Servers -Name[es]=Servidor NFS -GenericName[es]=Configurar el servidor NFS -Name[hu]=NFS szerver -GenericName[hu]=Az NFS szerver beÃ¡llÃtÃ¡sa. -Name[it]=Server NFS -GenericName[it]=Configura il server NFS. -Name[ko]=NFS ìë² -GenericName[ko]=NFS ìë² êµ¬ì± -Name[nl]=NFS server -GenericName[nl]=Configureer NFS server -Name[pt]=Servidor NFS -GenericName[pt]=Configurar servidor NFS. -Name[sk]=NFS server -GenericName[sk]=KonfigurovaÅ¥ NFS server -Name[sv]=NFS-server -GenericName[sv]=StÃ¤ll in NFS-server -Name[bg]=NFS ÑÑÑÐ²ÑÑ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° NFS ÑÑÑÐ²ÑÑ. -GenericName[da]=KonfigurÃ©r NFS-server. -Name[el]=ÎÎ¹Î±ÎºÎ¿Î¼Î¹ÏÏÎ®Ï NFS -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÏÎµ ÏÎ¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏÎ® NFS. -Name[fr]=Serveur NFS -GenericName[fr]=Configuration du serveur NFS. -Name[ja]=NFS ãµã¼ã -GenericName[ja]=NFS ãµã¼ãã®è¨å® -GenericName[lt]=KonfigÅ«ruoti NFS serverÄ¯. -GenericName[ru]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° NFS-ÑÐµÑÐ²ÐµÑÐ°. -Name[sl]=StreÅ¾nik NFS -GenericName[sl]=Nastavi NFS streÅ¾nik -GenericName[tr]=NFS sunucusunu yapÄ±landÄ±r. X-KDE-SubstituteUID=true Modified: trunk/nis-client/package/yast2-nis-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/package/yast2-nis-cli… ============================================================================== --- trunk/nis-client/package/yast2-nis-client.changes (original) +++ trunk/nis-client/package/yast2-nis-client.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu Mar 29 11:05:36 CEST 2007 - jsuchome(a)suse.cz - changed dependency tag for yast2-core (#252988) Modified: trunk/nis-client/src/nis.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/nis.desktop?rev=3… ============================================================================== --- trunk/nis-client/src/nis.desktop (original) +++ trunk/nis-client/src/nis.desktop Fri May 25 13:39:58 2007 @@ -22,35 +22,4 @@ Name=NIS Client GenericName=Configure a NIS client -Name[cs]=Klient NIS -GenericName[cs]=Konfigurace klienta NIS -Name[de]=NIS-Client -GenericName[de]=Konfiguration des NIS-Clients -Name[es]=Cliente NIS -GenericName[es]=ConfiguraciÃ³n del cliente NIS -Name[hu]=NIS kliens -GenericName[hu]=A NIS kliens beÃ¡llÃtÃ¡sa -Name[it]=Client NIS -GenericName[it]=Configura il client NIS -Name[ko]=NIS í´ë¼ì´ì¸í¸ -GenericName[ko]=NIS í´ë¼ì´ì¸í¸ ì¤ì -Name[nl]=NIS cliÃ«nt -GenericName[nl]=Configureer NIS cliÃ«nt -Name[pt]=Cliente NIS -GenericName[pt]=Configurar cliente NIS -Name[sk]=Klient NIS -GenericName[sk]=KonfigurÃ¡cia klienta NIS -Name[sv]=NIS-klient -GenericName[sv]=StÃ¤ll in NIS-klient -GenericName[da]=KonfigurÃ©r NIS-klient -Name[el]=Î ÎµÎ»Î¬ÏÎ·Ï NIS -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÎ¿Ï NIS ÏÎµÎ»Î¬ÏÎ· -Name[fr]=Client NIS -GenericName[fr]=Configurer le client NIS -Name[ja]=NIS ã¯ã©ã¤ã¢ã³ã -GenericName[ja]=NIS ã¯ã©ã¤ã¢ã³ãã®è¨å® -GenericName[lt]=KonfigÅ«ruoti NIS klientÄ -Name[sl]=Odjemalec NIS -GenericName[sl]=Nastavitev NIS odjemalca -GenericName[tr]=NIS istemcisini yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/nis-server/package/yast2-nis-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/package/yast2-nis-ser… ============================================================================== --- trunk/nis-server/package/yast2-nis-server.changes (original) +++ trunk/nis-server/package/yast2-nis-server.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Nov 8 09:52:08 CET 2006 - jsuchome(a)suse.cz - fixed autoyast schema (#211014) Modified: trunk/nis-server/src/nis_server.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-server/src/nis_server.deskto… ============================================================================== --- trunk/nis-server/src/nis_server.desktop (original) +++ trunk/nis-server/src/nis_server.desktop Fri May 25 13:39:58 2007 @@ -22,38 +22,4 @@ Name=NIS Server GenericName=Configure a NIS server -Name[cs]=NIS server -GenericName[cs]=Konfigurovat NIS server -Name[de]=NIS-Server -GenericName[de]=NIS-Server konfigurieren -Name[es]=Servidor NIS -GenericName[es]=ConfiguraciÃ³n del servidor NIS -Name[hu]=NIS szerver -GenericName[hu]=A NIS szerver beÃ¡llÃtÃ¡sa -Name[it]=Server NIS -GenericName[it]=Configura il server NIS -Name[ko]=NIS ìë² -GenericName[ko]=NIS ìë² êµ¬ì± -Name[nl]=NIS server -GenericName[nl]=NIS server configuratie -Name[pt]=Servidor NIS -GenericName[pt]=Configurar servidor NIS -Name[sk]=NIS server -GenericName[sk]=KonfigurovaÅ¥ NIS server -Name[sv]=NIS-server -GenericName[sv]=StÃ¤ll in NIS-server -Name[da]=NIS-server -GenericName[da]=Indstil NIS-server -Name[el]=ÎÎ¾ÏÏÎ·ÏÎµÏÎ·ÏÎ®Ï NIS -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÎ¿Ï ÎµÎ¾ÏÏÎ·ÏÎµÏÎ·ÏÎ® NIS -Name[fr]=Serveur NIS -GenericName[fr]=Configurer le serveur NIS -Name[ja]=NIS ãµã¼ã -GenericName[ja]=NIS ãµã¼ãã®è¨å® -Name[lt]=NIS serveris -GenericName[lt]=KonfigÅ«ruoti NIS serverÄ¯ -Name[sl]=NIS StreÅ¾nik -GenericName[sl]=Nastavite NIS streÅ¾nik -Name[tr]=NIS sunucusu -GenericName[tr]=NFS sunucusunu yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed May 16 10:33:40 CEST 2007 - jsuchome(a)suse.cz - added support for simplified UI (#273619) Modified: trunk/online-update/src/cd_update.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/cd_update.desk… ============================================================================== --- trunk/online-update/src/cd_update.desktop (original) +++ trunk/online-update/src/cd_update.desktop Fri May 25 13:39:58 2007 @@ -21,39 +21,4 @@ Name=Patch CD Update GenericName=Install patches from CD to correct and improve your existing installation -Name[cs]=Aktualizace programu z CD -GenericName[cs]=NainstalovÃ¡nÃ novinek z CD k aktualizaci vaÅ¡Ã instalace. -Name[de]=Patch CD-Update -GenericName[de]=Patches von CD installieren, um die vorhandene Installation zu berichtigen oder zu verbessern. -Name[es]=ActualizaciÃ³n con el CD de parches -GenericName[es]=Instale los parches del CD para corregir y mejorar la instalaciÃ³n existente. -Name[hu]=FrissÃtÃ©s Patch CD-rÅl -GenericName[hu]=FrissÃtÅcsomagok telepÃtÃ©se CD-rÅl a meglÃ©vÅ rendszer bÅvÃtÃ©sÃ©hez Ã©s javÃtÃ¡sÃ¡hoz. -Name[it]=Aggiornamento dal CD delle patch -GenericName[it]=Installa le patch dal CD per correggere e migliorare il Vostro sistema. -Name[ko]=í¨ì¹ ì¨ë ìë°ì´í¸ -GenericName[ko]=íì¬ ìì¤íì êµì ê³¼ ê°ì ì ìíì¬ CDë¡ ë¶í° í¨ì¹ë¥¼ ì¤ì¹í©ëë¤. -Name[nl]=Patch CD update -GenericName[nl]=Installeer patches van CD om uw bestaande installatie te corrigeren en te verbeteren. -Name[pt]=AtualizaÃ§Ã£o CD Patch -GenericName[pt]=Instalar patches do CD para corrigir e melhorar sua instalaÃ§Ã£o existente. -Name[sk]=AktualizÃ¡cia z CD -GenericName[sk]=InÅ¡talÃ¡cia oprÃ¡v z CD pre opravu alebo vylepÅ¡enie existujÃºceho systÃ©mu. -Name[sv]=Uppdatera med programfix-cd -GenericName[sv]=Installera programfixar frÃ¥n cd-skiva fÃ¶r att korrigera och fÃ¶rbÃ¤ttra befintligt system -Name[da]=OpdatÃ©r med programrettelses-cd -GenericName[da]=Hent rettelser fra cd for at rette og forbedre din eksisterende installation. -Name[el]=ÎÎ½Î·Î¼ÎÏÏÏÎ· Î¼ÎÏÏ ÏÎ¿Ï CD ÎÎ¹Î¿ÏÎ¸ÏÏÎµÏÎ½ -GenericName[el]=ÎÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÏÎµ ÏÎ¹Ï Î´Î¹Î¿ÏÎ¸ÏÏÎµÎ¹Ï Î±ÏÏ CD Î³Î¹Î± Î½Î± Î´Î¹Î¿ÏÎ¸ÏÏÎµÏÎµ ÎºÎ±Î¹ Î½Î± Î²ÎµÎ»ÏÎ¹ÏÏÎµÏÎµ ÏÎ·Î½ ÏÏÎ¬ÏÏÎ¿ÏÏÎ± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·. -Name[fr]=Mise Ã jour avec le CD de patches -GenericName[fr]=Installez les patches du CD pour corriger ou amÃ©liorer votre installation. -Name[ja]=ããã CD ã«ããã¢ãããã¼ã -GenericName[ja]=ããªãã®ã·ã¹ãã ãä¿®æ£ããããã«ãCD ã«ããããããã¤ã³ã¹ãã¼ã«ããã -Name[lt]=Atnaujinimas iÅ¡ pataisÅ³ CD -GenericName[lt]=Ä®diegti pataisas iÅ¡ CD, norint pakoreguoti ir iÅ¡taisyti jÅ«sÅ³ esamÄ sistemÄ. -Name[ru]=ÐÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ñ patch CD -Name[sl]=Posodobitev s CD-ja -GenericName[sl]=Namestite popravke s CD-ja za popravilo in izboljÅ¡anje vaÅ¡e obstojeÄe namestitve. -Name[tr]=Yama CD'sinden-gÃ¼ncelleme -GenericName[tr]=Mevcut kurulumu dÃ¼zeltmek ve gÃ¼ncellemek iÃ§in CD'den yama yÃ¼kleme X-KDE-SubstituteUID=true Modified: trunk/online-update/src/online_update.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/online_update.… ============================================================================== --- trunk/online-update/src/online_update.desktop (original) +++ trunk/online-update/src/online_update.desktop Fri May 25 13:39:58 2007 @@ -22,39 +22,4 @@ Name=Online Update GenericName=Get patches to correct and improve your existing installation -Name[cs]=Aktualizace programu online -GenericName[cs]=ZÃskat novinky, kterÃ© zlepÅ¡Ã nebo opravÃ vaÅ¡i souÄasnou instalaci. -Name[de]=Online-Update -GenericName[de]=Patches holen, um die bestehende Installation zu berichtigen oder zu verbessern. -Name[es]=ActualizaciÃ³n en lÃnea -GenericName[es]=Obtenga los parches para corregir o mejorar la instalaciÃ³n existente -Name[hu]=Online frissÃtÃ©s -GenericName[hu]=FrissÃtÅcsomagok letÃ¶ltÃ©se a meglÃ©vÅ rendszer bÅvÃtÃ©sÃ©hez Ã©s javÃtÃ¡sÃ¡hoz -Name[it]=Aggiornamento in linea -GenericName[it]=Scarica le patch per correggere e migliorare il Vostro sistema -Name[ko]=ì¨ë¼ì¸ ìë°ì´í¸ -GenericName[ko]=íì¬ ìì¤íì êµì ê³¼ ê°ì ì ìíì¬ í¨ì¹ë¥¼ ê°ì ¸ìµëë¤. -Name[nl]=Online update -GenericName[nl]=Gebruik patches om uw bestaande installatie te corrigeren en te verbeteren -Name[pt]=AtualizaÃ§Ã£o Online -GenericName[pt]=Obter patches para corrigir e melhorar sua instalaÃ§Ã£o existente -Name[sk]=On-line aktualizÃ¡cia -GenericName[sk]=ZÃskaÅ¥ opravy, ktorÃ© zlepÅ¡ia alebo opravia vaÅ¡u inÅ¡talÃ¡ciu -Name[sv]=Online-uppdatering -GenericName[sv]=HÃ¤mta programfixar fÃ¶r att korrigera och fÃ¶rbÃ¤ttra befintligt system -Name[da]=Online opdatering -GenericName[da]=Hent rettelser for at rette og forbedre din eksisterende installation -Name[el]=Online ÎÎ½Î·Î¼ÎÏÏÏÎ· -GenericName[el]=Î Î±ÏÎ±Î»Î±Î²Î® Î´Î¹Î¿ÏÎ¸ÏÏÎµÏÎ½ Î³Î¹Î± Î´Î¹ÏÏÎ¸ÏÏÎ· ÎºÎ±Î¹ Î²ÎµÎ»ÏÎ¯ÏÏÎ· ÏÎ·Ï ÏÏÎ¬ÏÏÎ¿ÏÏÎ±Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï -Name[fr]=Mise Ã jour en ligne -GenericName[fr]=Utilisez les patches pour corriger ou amÃ©liorer votre installation -Name[ja]=ãªã³ã©ã¤ã³ã»ã¢ãããã¼ã -GenericName[ja]=ããªãã®ã·ã¹ãã ãä¿®æ£ããããã«ããããããã¦ã³ãã¼ããã¦ä¸ããã -Name[lt]=Atnaujinimas internetu -GenericName[lt]=Gauti pataisas norint pakoreguoti ir iÅ¡taisyti jÅ«sÅ³ egzistuojanÄiÄ sistemÄ -Name[ru]=ÐÐ½Ð»Ð°Ð¹Ð½-Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ -Name[sl]=Spletna Posodobitev -GenericName[sl]=Pridobite popravke za popravilo in izboljÅ¡anje vaÅ¡e obstojeÄe namestitve. -Name[tr]=ÃevrimiÃ§i gÃ¼ncelleme -GenericName[tr]=Mevcut kurulumu dÃ¼zeltmek ve gÃ¼ncellemek iÃ§in Ã§evrimiÃ§i yama edinme X-KDE-SubstituteUID=true Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu May 24 17:27:04 CEST 2007 - lslezak(a)suse.cz - install 'portmap' package if installing from a NFS source Modified: trunk/packager/src/config/sw_single.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/config/sw_single.de… ============================================================================== --- trunk/packager/src/config/sw_single.desktop (original) +++ trunk/packager/src/config/sw_single.desktop Fri May 25 13:39:58 2007 @@ -21,38 +21,4 @@ Name=Software Management GenericName=Install additional software packages or remove installed packages -Name[cs]=SprÃ¡vce programÅ¯ -GenericName[cs]=Instalovat dalÅ¡Ã softwarovÃ© balÃky nebo odebrat instalovanÃ© balÃky. -Name[de]=Software installieren oder lÃ¶schen -GenericName[de]=ZusÃ¤tzliche Software-Pakete installieren oder installierte Pakete entfernen. -Name[es]=Instalar/desinstalar software -GenericName[es]=Instalar paquetes de software adicionales o eliminar los instalados. -Name[hu]=Szoftver telepÃtÃ©se, eltÃ¡volÃtÃ¡sa -GenericName[hu]=TovÃ¡bbi szoftver csomagok telepÃtÃ©se vagy telepÃtett csomagok eltÃ¡volÃtÃ¡sa -Name[it]=Installare/togliere i pacchetti -GenericName[it]=Installa ulteriori pacchetti o rimuovi pacchetti installati. -Name[ko]=ìíí¸ì¨ì´ ì¤ì¹/ì ê±° -GenericName[ko]=ì¶ê° ìíí¸ì¨ì´ í¨í¤ì§ ì¤ì¹ í¹ì ì¤ì¹ë í¨í¤ì§ ì ê±° -Name[nl]=Software installeren en verwijderen -GenericName[nl]=Installeer extra software pakketten of verwijder geÃ¯nstalleerde pakketten. -Name[pt]=Instalar e Remover software -GenericName[pt]=Instalar pacote de software adicional ou remover pacotes instalados. -Name[sk]=InÅ¡talÃ¡cia a odstrÃ¡nenie software -GenericName[sk]=DoinÅ¡talovanie alebo odobratie software -Name[sv]=Installera och ta bort program -GenericName[sv]=Installera nya programpaket eller ta bort installerade paket -Name[bg]=ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð¸ Ð¿ÑÐµÐ¼Ð°ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ -GenericName[bg]=ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð´Ð¾Ð¿ÑÐ»Ð½Ð¸ÑÐµÐ»Ð½Ð¸ Ð¿Ð°ÐºÐµÑÐ¸ Ð¸Ð»Ð¸ Ð¿ÑÐµÐ¼Ð°ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð²ÐµÑÐµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ð¸. -GenericName[da]=InstallÃ©r flere programpakker eller fjern installerede programpakker. -Name[el]=Î ÏÎ¿ÏÎ¸Î±ÏÎ±Î¯ÏÎµÏÎ· ÎÎ¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï -GenericName[el]=ÎÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÏÎµ ÎµÏÎ¹ÏÎ»ÎÎ¿Î½ ÏÎ±ÎºÎÏÎ¿ Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï Î® Î±ÏÎ±Î¹ÏÎÏÏÎµ ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½Î± ÏÎ±ÎºÎÏÎ±. -Name[fr]=Installer et supprimer des logiciels -GenericName[fr]=Installer des paquetages supplÃ©mentaires ou supprimer des paquetages installÃ©s. -Name[ja]=ã½ããã¦ã§ã¢ã®ã¤ã³ã¹ãã¼ã«/åé¤ -GenericName[ja]=æ°ããããã±ã¼ã¸ã®ã¤ã³ã¹ãã¼ã«ã¾ãã¯ãã¤ã³ã¹ãã¼ã«æ¸ã®ããã±ã¼ã¸ã®åé¤ -GenericName[lt]=Ä®diegti papildomÄ programinÄs Ä¯rangos paketÄ arba paÅ¡alinti Ä¯diegtÄ. -GenericName[ru]=Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½ÑÐµ Ð¿Ð°ÐºÐµÑÑ Ð¸Ð»Ð¸ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÐ¶Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÐµ. -Name[sl]=Namesti in odstrani programsko opremo -GenericName[sl]=Namesti dodaten programski paket ali odstrani nameÅ¡Äene pakete. -GenericName[tr]=Yeni yazÄ±lÄ±m paketleri kurun ya da mevcut paketleri kaldÄ±rÄ±n X-KDE-SubstituteUID=true Modified: trunk/packager/src/config/sw_source.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/config/sw_source.de… ============================================================================== --- trunk/packager/src/config/sw_source.desktop (original) +++ trunk/packager/src/config/sw_source.desktop Fri May 25 13:39:58 2007 @@ -21,36 +21,4 @@ Name=Installation Source GenericName=Choose the source for installation of software packages (CD, network, etc.) -Name[cs]=ZmÄnit instalaÄnÃ zdroj -GenericName[cs]=Zvolte zdroj (napÅ. CD nebo sÃÅ¥) pro instalaci softwarovÃ½ch balÃÄkÅ¯. -Name[de]=Installationsquelle wechseln -GenericName[de]=WÃ¤hlen Sie die Quelle (z.B. CD oder Netzwerk) fÃ¼r die Installation der Software-Pakete. -Name[es]=Cambiar fuente de instalaciÃ³n -GenericName[es]=Seleccione la fuente para la instalaciÃ³n de paquetes de software (ej. CD o red). -Name[hu]=TelepÃtÃ©si forrÃ¡s meghatÃ¡rozÃ¡sa -GenericName[hu]=VÃ¡lassza ki a forrÃ¡st (pl. CD vagy hÃ¡lÃ³zat) a szoftvercsomagok telepÃtÃ©sÃ©hez. -Name[it]=Cambia sorgente d'installazione -GenericName[it]=Selezionate l'origine della installazione (p.e.CD o rete) dei pacchetti di software. -Name[ko]=ì¤ì¹ ìë³¸ ë³ê²½ -GenericName[ko]=ì¤ì¹í ìíí¸ì¨ì´ í¨í¤ì§ë¥¼ ìí´ì ìë³¸(ì. CD í¹ì ë¤í¸ìí¬)ë¥¼ ì ííììì¤. -Name[nl]=Wijzig installatiebron -GenericName[nl]=Kies de bron (bijv: CD of netwerk) voor de software pakketten installatie. -Name[pt]=Modificar fonte da instalaÃ§Ã£o -GenericName[pt]=Escolha a fonte (ex: CD ou rede) para a instalaÃ§Ã£o ou pacotes de software. -Name[sk]=Zmena zdroja inÅ¡talÃ¡cie -GenericName[sk]=Vyberte zdroj (napr. CD alebo sieÅ¥) pre inÅ¡talÃ¡ciu balÃkov. -Name[sv]=Ãndra installationskÃ¤lla -GenericName[sv]=VÃ¤lj kÃ¤llan (t ex cd eller nÃ¤tverk) fÃ¶r installationen av programpaket. -Name[bg]=ÐÑÐ¾Ð¼ÑÐ½Ð° Ð½Ð° Ð¸Ð·ÑÐ¾ÑÐ½Ð¸ÐºÐ° Ð½Ð° Ð¸Ð½ÑÑÐ°Ð»Ð°ÑÐ¸Ñ -GenericName[bg]=ÐÐ·Ð±ÐµÑÐµÑÐµ Ð¸Ð·ÑÐ¾ÑÐ½Ð¸ÐºÐ° (Ð½Ð°Ð¿Ñ. ÐºÐ¾Ð¼Ð¿Ð°ÐºÑÐ´Ð¸ÑÐº Ð¸Ð»Ð¸ Ð¼ÑÐµÐ¶Ð°) Ð·Ð° Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð°ÐºÐµÑÐ¸ÑÐµ. -Name[el]=ÎÎ»Î»Î±Î³Î® Î Î·Î³Î®Ï ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï -GenericName[el]=ÎÏÎ¹Î»ÎÎ¾ÏÎµ ÏÎ·Î½ ÏÎ·Î³Î® (Ï.Ï. CD Î® Î´Î¯ÎºÏÏÎ¿) Î³Î¹Î± ÏÎ·Î½ ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÏÎ½ ÏÎ±ÎºÎÏÏÎ½ Î»Î¿Î³Î¹ÏÎ¼Î¹ÎºÎ¿Ï. -Name[fr]=Changer le support d'installation -GenericName[fr]=Choisir la source (par ex. CD ou rÃ©seau) pour l'installation des paquetages logiciels. -Name[ja]=ã¤ã³ã¹ãã¼ã«ã®ã½ã¼ã¹ãå¤æ´ãã -GenericName[ja]=ã½ããã¦ã§ã¢ã»ããã±ã¼ã¸ã®ã¤ã³ã¹ãã¼ã«ã»ã½ã¼ã¹ãé¸æãã¦ä¸ãã(ä¾ãã°ã CD ãããã¯ãããã¯ã¼ã¯)ã -GenericName[lt]=Pasirinkite Å¡altinÄ¯ (pvz. CD arba tinklÄ) programiniÅ³ paketÅ³ diegimui. -Name[sl]=Spremenite vir namestitve -GenericName[sl]=Izberite izvor (npr. CD ali omreÅ¾je) za namestitev programskih paketov. -GenericName[tr]=YazÄ±lÄ±m paketlerinin kurulumu iÃ§in kaynaÄÄ± seÃ§in (CD ya da aÄ gibi) X-KDE-SubstituteUID=true Modified: trunk/phone-services/package/yast2-phone-services.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/phone-services/package/yast2-pho… ============================================================================== --- trunk/phone-services/package/yast2-phone-services.changes (original) +++ trunk/phone-services/package/yast2-phone-services.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu May 10 11:32:41 CEST 2007 - jsuchome(a)suse.cz - enable translation of MailAndSave and SaveOnly entries (#145513) Modified: trunk/phone-services/src/config/answering_machine.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/phone-services/src/config/answer… ============================================================================== --- trunk/phone-services/src/config/answering_machine.desktop (original) +++ trunk/phone-services/src/config/answering_machine.desktop Fri May 25 13:39:58 2007 @@ -21,36 +21,4 @@ Name=Phone Answering Machine GenericName=Set up a phone answering machine -Name[cs]=TelefonnÃ zÃ¡znamnÃk -GenericName[cs]=Nastavit telefonnÃ zÃ¡znamnÃk -Name[de]=Anrufbeantworter -GenericName[de]=Anrufbeantworter einrichten -Name[es]=Contestador automÃ¡tico -GenericName[es]=Configurar contestador automÃ¡tico -Name[hu]=ÃzenetrÃ¶gzÃtÅ -GenericName[hu]=ÃllÃtson be Ã¼zenetrÃ¶gzÃtÅt -Name[it]=Segreteria telefonica -GenericName[it]=Impostare la segreteria telefonica -Name[ko]=ì íìëµ ìì¤í -GenericName[ko]=ì íìëµ ìì¤íì ì¤ì íì¸ì. -Name[nl]=Telefoon antwoordapparaat -GenericName[nl]=Telefoon antwoordapparaat instelling -Name[pt]=MÃ¡quina de Atender Telefone -GenericName[pt]=Configurar mÃ¡quina de atender telefone -Name[sk]=TelefÃ³nny odkazovaÄ -GenericName[sk]=Nastavenie telefÃ³nneho odkazovaÄa -Name[sv]=Telefonsvarare -GenericName[sv]=StÃ¤ll in telefonsvarare -Name[el]=ÎÏÏÏÎ¼Î±ÏÎ¿Ï Î¤Î·Î»ÎµÏÏÎ½Î·ÏÎ®Ï -GenericName[el]=ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÎÏÏÏÎ¼Î±ÏÎ¿Ï ÏÎ·Î»ÎµÏÏÎ½Î·ÏÎ® -Name[fr]=RÃ©pondeur tÃ©lÃ©phonique -GenericName[fr]=Configurer le rÃ©pondeur tÃ©lÃ©phonique -Name[ja]=çå®çªé»è©± -GenericName[ja]=çå®çªé»è©±ã®è¨å® -Name[lt]=Telefono autoatsakovas -GenericName[lt]=KonfigÅ«ruoti autoatsakovÄ -Name[sl]=Telefonska tajnica -GenericName[sl]=Nastavi telefonsko tajnico -Name[tr]=Telesekreter -GenericName[tr]=Telesekreteri kur X-KDE-SubstituteUID=true Modified: trunk/phone-services/src/config/fax.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/phone-services/src/config/fax.de… ============================================================================== --- trunk/phone-services/src/config/fax.desktop (original) +++ trunk/phone-services/src/config/fax.desktop Fri May 25 13:39:58 2007 @@ -21,26 +21,4 @@ Name=Fax GenericName=Set up an ISDN fax device -GenericName[cs]=Nastavit ISDN fax -GenericName[de]=ISDN-FaxgerÃ¤t einrichten -GenericName[es]=Configurar fax RDSI -GenericName[hu]=ÃllÃtsa be az ISDN fax eszkÃ¶zt -GenericName[it]=Impostare un dispositivo fax ISDN -Name[ko]=í©ì¤ -GenericName[ko]=ISDN í©ì¤ ì¥ì¹ë¥¼ ì ííììì¤ -GenericName[nl]=ISDN fax apparaat instelling -GenericName[pt]=Configurar dispositivo fax ISDN -GenericName[sk]=Nastavenie zariadenia ISDN fax -GenericName[sv]=StÃ¤ll in ISDN faxenhet -Name[el]=Î¦Î±Î¾ -GenericName[el]=ÎÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÏÎµ ÏÎ·Î½ ISDN ÏÏÏÎºÎµÏÎ® ÏÎ±Î¾ ÏÎ±Ï -Name[fr]=TÃ©lÃ©copie -GenericName[fr]=Configurer le pÃ©riphÃ©rique fax RNIS (ISDN) -GenericName[ja]=ISDN Fax ããã¤ã¹ãè¨å®ãã -Name[lt]=Faksas -GenericName[lt]=KonfigÅ«ruoti ISDN Ä¯renginÄ¯ -Name[sl]=Telefaks -GenericName[sl]=Nastavi ISDN telefaks napravo -Name[tr]=Faks -GenericName[tr]=ISDN faks aygÄ±tÄ±nÄ± kur X-KDE-SubstituteUID=true Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Mon May 7 13:04:18 CEST 2007 - mzugec(a)suse.cz - include cups-drivers if needed (#218760) Modified: trunk/printer/src/config/printer.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/config/printer.deskt… ============================================================================== --- trunk/printer/src/config/printer.desktop (original) +++ trunk/printer/src/config/printer.desktop Fri May 25 13:39:58 2007 @@ -23,35 +23,4 @@ Name=Printer GenericName=Configure printers -Name[cs]=TiskÃ¡rna -GenericName[cs]=Nakonfigurujte si tiskÃ¡rnu. -Name[de]=Drucker -GenericName[de]=Konfiguration des Druckers. -Name[es]=Impresora -GenericName[es]=Configurar impresora: -Name[hu]=NyomtatÃ³k -GenericName[hu]=NyomtatÃ³ beÃ¡llÃtÃ¡sa -Name[it]=Stampante -GenericName[it]=Configurate la Vostra stampante. -Name[ko]=íë¦°í° -GenericName[ko]=íë¦°í° ì¤ì -GenericName[nl]=Configureer uw printer. -Name[pt]=Impressora -GenericName[pt]=Configurar sua impressora -Name[sk]=TlaÄiareÅ -GenericName[sk]=KonfigurÃ¡cia tlaÄiarne. -Name[sv]=Skrivare -GenericName[sv]=StÃ¤ll in skrivare -Name[el]=ÎÎºÏÏÏÏÏÎ®Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÎµÎºÏÏÏÏÏÎ®. -Name[fr]=Imprimante -GenericName[fr]=Configurer votre imprimante. -Name[ja]=ããªã³ã¿ã¼ -GenericName[ja]=ããªã³ã¿ã¼ãè¨å®ããã -Name[lt]=Spausdintuvas -GenericName[lt]=KonfigÅ«ruoti savo spausdintuvÄ. -Name[sl]=Tiskalnik -GenericName[sl]=Nastavite tiskalnik. -Name[tr]=YazÄ±cÄ± -GenericName[tr]=YazÄ±cÄ±nÄ±zÄ± yapÄ±landÄ±rÄ±n X-KDE-SubstituteUID=true Modified: trunk/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-pr… ============================================================================== --- trunk/profile-manager/package/yast2-profile-manager.changes (original) +++ trunk/profile-manager/package/yast2-profile-manager.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Fri Nov 10 13:57:27 CET 2006 - jsuchome(a)suse.cz - mark forgotten text for translation (#219795) Modified: trunk/profile-manager/src/profile-manager.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/profile-mana… ============================================================================== --- trunk/profile-manager/src/profile-manager.desktop (original) +++ trunk/profile-manager/src/profile-manager.desktop Fri May 25 13:39:58 2007 @@ -21,36 +21,4 @@ Name=Profile Manager GenericName=Configure SCPM profiles -Name[cs]=SprÃ¡vce profilÅ¯ -GenericName[cs]=Konfigurovat profily -Name[de]=Profil-Manager -GenericName[de]=Profile konfigurieren -Name[es]=Gestor de perfiles -GenericName[es]=Configurar perfiles -Name[hu]=ProfilkezelÅ -GenericName[hu]=Profilok beÃ¡llÃtÃ¡sa -Name[it]=Gestione profili -GenericName[it]=Configura profili -Name[ko]=íë¡íì¼ ë©ëì -GenericName[ko]=íë¡íì¼ ì¤ì -Name[nl]=Profiel-beheerder -GenericName[nl]=Configureer profielen -Name[pt]=Gerenciador de Perfil -GenericName[pt]=Configurar Perfis -Name[sk]=SprÃ¡vca profilov -GenericName[sk]=KonfigurovaÅ¥ profily -Name[sv]=Profilhanterare -GenericName[sv]=StÃ¤ll in profiler -Name[el]=ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· ÏÏÎ¿ÏÎ¯Î» -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÏÎ¿ÏÎ¯Î» -Name[fr]=Gestionnaire de profils -GenericName[fr]=Configurer les profils -Name[ja]=ãããã£ã¼ã«ã»ããã¼ã¸ã£ã¼ -GenericName[ja]=ãããã£ã¼ã«ã®è¨å® -Name[lt]=Profailo tvarkyklÄ -GenericName[lt]=KonfigÅ«ruoti profailus -Name[sl]=Upravnik profilov -GenericName[sl]=Nastavi profile -Name[tr]=Profil dÃ¼zenleyicisi -GenericName[tr]=Profilleri yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed May 16 10:32:17 CEST 2007 - jsuchome(a)suse.cz - checking of /etc/fstab adapted to current standards (#273105) Modified: trunk/repair/src/bootmsg.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/bootmsg.desktop?rev=3… ============================================================================== --- trunk/repair/src/bootmsg.desktop (original) +++ trunk/repair/src/bootmsg.desktop Fri May 25 13:39:58 2007 @@ -21,40 +21,4 @@ Name=Start-Up Log GenericName=Display the boot log (/var/log/boot.msg) -Name[cs]=Zobrazit startovacÃ protokol (log) -GenericName[cs]=Tento modul zobrazÃ startovacÃ protokol (log) /var/log/boot.msg -Name[de]=Startprotokoll anzeigen -GenericName[de]=Dieses Modul gibt das Bootprotokoll (/var/log/boot.msg) aus. -Name[en]=View Start-up Log -Name[es]=Ver el log de arranque -GenericName[es]=Este mÃ³dulo visualiza el registro de arranque (/var/log/boot.msg) -Name[hu]=IndÃtÃ¡si naplÃ³ megtekintÃ©se -GenericName[hu]=Ez a modul megmutatja a rendszerindÃtÃ¡si naplÃ³t (/var/log/boot.msg) -Name[it]=Mostra il log di avvio -GenericName[it]=Questo modulo mostra il log di avvio (/var/log/boot.msg) -Name[ko]=ì¤íí¸ì ë¡ê·¸ ë³´ê¸° -GenericName[ko]=ì´ ëª¨ëì ë¶íë¡ê·¸(/var/log/boot.msg)ë¥¼ íì -Name[nl]=Bekijk startup log -GenericName[nl]=Deze module laat de boot log (/var/log/boot.msg) zien -Name[pt]=Ver o log de inicializaÃ§Ã£o -GenericName[pt]=Este mÃ³dulo mostra o log de boot (/var/log/boot.msg) -Name[sk]=ZobraziÅ¥ Å¡tartovacÃ protokol (log) -GenericName[sk]=Tento modul zobrazÃ Å¡tartovacÃ protokol (log) /var/log/boot.msg -Name[sv]=Visa startlogg -GenericName[sv]=Den hÃ¤r modulen visar startloggen (/var/log/boot.msg) -Name[da]=Se opstartslog -GenericName[da]=Dette modul viser opstartsloggen (/var/log/boot.msg) -Name[el]=ÎÎµÎ¯ÏÎµ ÏÎ¿ Î±ÏÏÎµÎ¯Î¿ ÎºÎ±ÏÎ±Î³ÏÎ±ÏÎ®Ï ÏÎ·Ï ÎµÎºÎºÎ¯Î½Î·ÏÎ·Ï -GenericName[el]=ÎÏÏÏ Î· Î¼Î¿Î½Î¬Î´Î± ÎµÎ¼ÏÎ±Î½Î¯Î¶ÎµÎ¹ ÏÎ·Î½ Î±Î½Î±ÏÎ¿ÏÎ¬ ÎµÎºÎºÎ¯Î½Î·ÏÎ·Ï (/var/log/boot.msg) -Name[en]=View Start-up Log -Name[fr]=Voir le journal de dÃ©marrage -GenericName[fr]=Ce module affiche le journal de dÃ©marrage (/var/log/boot.msg) -Name[ja]=åèµ·åã®è¨é²ãè¦ãã -GenericName[ja]=ãã®ã¢ã¸ã¥ã¼ã«ã¯åèµ·åã®è¨é²ï¼/var/log/boot.msgï¼ãè¡¨ç¤ºãã¾ãã -Name[lt]=Rodyti sistemos paleidimo registracijos bylÄ -GenericName[lt]=Å is modulis rodo Ä¯krovos registracijos bylÄ (/var/log/boot.msg) -Name[sl]=PrikaÅ¾i zagonski dnevnik -GenericName[sl]=Ta modul prikaÅ¾e zagonski dnevnik (/var/log/boot.msg). -Name[tr]=AÃ§Ä±lÄ±Å kayÄ±tlarÄ±nÄ± gÃ¶r -GenericName[tr]=Bu modÃ¼l aÃ§Ä±lÄ±Å kayÄ±tlarÄ±nÄ± gÃ¶sterir (/var/log/boot.msg) X-KDE-SubstituteUID=true Modified: trunk/repair/src/messages.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/messages.desktop?rev=… ============================================================================== --- trunk/repair/src/messages.desktop (original) +++ trunk/repair/src/messages.desktop Fri May 25 13:39:58 2007 @@ -21,40 +21,4 @@ Name=System Log GenericName=Display the system's log (/var/log/messages) -Name[cs]=Zobrazit systÃ©movÃ½ protokol (log) -GenericName[cs]=Tento modul zobrazÃ systÃ©movÃ½ protokol (log) /var/log/messages -Name[de]=Systemprotokoll anzeigen -GenericName[de]=Dieses Modul gibt das Systemprotokoll (/var/log/messages) aus. -Name[en]=View System Log -Name[es]=Ver registro de sistema -GenericName[es]=Este mÃ³dulo visualiza el registro del sistema (/var/log/messages) -Name[hu]=RendszernaplÃ³ megtekintÃ©se -GenericName[hu]=Ez a modul megmutatja a rendszernaplÃ³t (/var/log/messages) -Name[it]=Mostra il log di sistema -GenericName[it]=Questo modulo mostra il log di sistema (/var/log/messages) -Name[ko]=ìì¤í ë¡ê·¸ ë³´ê¸° -GenericName[ko]=ì´ ëª¨ëì ìì¤íë¡ê·¸(/var/log/messages)ë¥¼ íì -Name[nl]=Laat systeem log zien -GenericName[nl]=Deze module laat het systeem log zien (/var/log/messages) -Name[pt]=Ver o log de sistema -GenericName[pt]=Este mÃ³dulo mostra o log do sistema (/var/log/messages) -Name[sk]=ZobraziÅ¥ systÃ©movÃ½ protokol (log) -GenericName[sk]=Tento modul zobrazÃ systÃ©movÃ½ protokol (log) /var/log/messages -Name[sv]=Visa systemlogg -GenericName[sv]=Den hÃ¤r modulen visar systemloggen (/var/log/messages) -Name[da]=Se system log -GenericName[da]=Dette modul viser systemets log (/var/log/messages) -Name[el]=Î ÏÎ¿Î²Î¿Î»Î® ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï ÎºÎ±ÏÎ±Î³ÏÎ±ÏÎ®Ï ÏÎ¿Ï ÏÏÏÏÎ®Î¼Î±ÏÎ¿Ï -GenericName[el]=ÎÏÏÏ Î· Î¼Î¿Î½Î¬Î´Î± ÎµÎ¼ÏÎ±Î½Î¯Î¶ÎµÎ¹ ÏÎ¿ Î±ÏÏÎµÎ¯Î¿ ÎºÎ±ÏÎ±Î³ÏÎ±ÏÎ®Ï ÏÏÏÏÎ®Î¼Î±ÏÎ¿Ï (/var/log/messages) -Name[en]=View System Log -Name[fr]=Voir le journal du systÃ¨me -GenericName[fr]=Ce module affiche le journal du systÃ¨me (/var/log/messages) -Name[ja]=ã·ã¹ãã ã®è¨é²ãè¦ãã -GenericName[ja]=ãã®ã¢ã¸ã¥ã¼ã«ã¯åèµ·åã®è¨é²ï¼/var/log/messagesï¼ãè¡¨ç¤ºãã¾ãã -Name[lt]=Rodyti sistemos registracijos bylÄ -GenericName[lt]=Å is modulis rodo sistemos registracijos bylÄ (/var/log/messages) -Name[sl]=PrikaÅ¾i sistemski dnevnik -GenericName[sl]=Ta modul prikaÅ¾e sistemski dnevnik (/var/log/messages). -Name[tr]=Sistem kayÄ±tlarÄ±nÄ± gÃ¶r -GenericName[tr]=Bu modÃ¼l sistem kayÄ±tlarÄ±nÄ± gÃ¶sterir (/var/log/messages) X-KDE-SubstituteUID=true Modified: trunk/repair/src/repair.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/repair.desktop?rev=38… ============================================================================== --- trunk/repair/src/repair.desktop (original) +++ trunk/repair/src/repair.desktop Fri May 25 13:39:58 2007 @@ -21,30 +21,4 @@ Name=System Repair GenericName=System Repair -Name[cs]=Oprava systÃ©mu -GenericName[cs]=Oprava systÃ©mu -Name[de]=System-Reparatur -GenericName[de]=System-Reparatur -Name[es]=ReparaciÃ³n del sistema -GenericName[es]=ReparaciÃ³n del sistema -Name[hu]=Rendszer helyreÃ¡llÃtÃ¡s -GenericName[hu]=Rendszer helyreÃ¡llÃtÃ¡s -Name[it]=Riparazione sistema -GenericName[it]=Riparazione sistema -Name[ko]=ìì¤í ìë¦¬ -GenericName[ko]=ìì¤í ìë¦¬ -Name[nl]=Systeem reparatie -GenericName[nl]=Systeem reparatie -Name[pt]=Reparo do Sistema -GenericName[pt]=Reparo do Sistema -Name[sk]=Oprava systÃ©mu -GenericName[sk]=Oprava systÃ©mu -Name[sv]=Systemreparation -GenericName[sv]=Systemreparation -Name[el]=ÎÏÎ¹ÏÎºÎµÏÎ® Î£ÏÏÏÎ®Î¼Î±ÏÎ¿Ï -GenericName[el]=ÎÏÎ¹ÏÎºÎµÏÎ® Î£ÏÏÏÎ®Î¼Î±ÏÎ¿Ï -Name[fr]=RÃ©paration du systÃ¨me -GenericName[fr]=RÃ©paration du systÃ¨me -Name[tr]=Sistem tamiri -GenericName[tr]=Sistem tamiri X-KDE-SubstituteUID=true Modified: trunk/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.ch… ============================================================================== --- trunk/restore/package/yast2-restore.changes (original) +++ trunk/restore/package/yast2-restore.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Fri Mar 9 13:45:39 CET 2007 - locilka(a)suse.cz - Adjusted RPM dependencies: yast2-installation is not needed. Modified: trunk/restore/src/restore.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/restore.desktop?rev=… ============================================================================== --- trunk/restore/src/restore.desktop (original) +++ trunk/restore/src/restore.desktop Fri May 25 13:39:58 2007 @@ -21,38 +21,4 @@ Name=System Restoration GenericName=Restore files from a backup archive -Name[cs]=Obnova systÃ©mu -GenericName[cs]=Obnovit soubory ze zÃ¡loÅ¾nÃho archÃvu -Name[de]=System wiederherstellen -GenericName[de]=Dateien aus Backup-Archiv wiederherstellen -Name[es]=Recuperar sistema -GenericName[es]=Recuperar ficheros del archivo copia de seguridad -Name[hu]=Rendszer visszaÃ¡llÃtÃ¡sa -GenericName[hu]=FÃ¡jlok visszaÃ¡llÃtÃ¡sa az archÃvumbÃ³l -Name[it]=Ripristina sistema -GenericName[it]=Ripristina file dall'archivio di backup -Name[ko]=ìì¤í ë³µêµ¬ -GenericName[ko]=ë°±ì ìì¹´ì´ë¸ë¡ ë¶í° íì¼ ë³µêµ¬ -Name[nl]=Restore systeem -GenericName[nl]=Restore bestanden van backup archief -Name[pt]=Restaurar sistema -GenericName[pt]=Restaurar arquivos do arquivo de backup -Name[sk]=Obnova systÃ©mu -GenericName[sk]=Obnova sÃºborov z archÃvu zÃ¡lohy -Name[sv]=ÃterstÃ¤ll system -GenericName[sv]=ÃterstÃ¤ll filer frÃ¥n sÃ¤kerhetskopia -Name[el]=ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ Î£ÏÏÏÎ®Î¼Î±ÏÎ¿Ï -GenericName[el]=ÎÏÎ±Î½Î±ÏÎ¿ÏÎ¬ Î±ÏÏÎµÎ¯ÏÎ½ Î±ÏÏ Î±ÏÏÎµÎ¹Î¿Î¸Î®ÎºÎ· -Name[fr]=Restaurer le systÃ¨me -GenericName[fr]=Restaurer les fichiers Ã partir de l'archive de sauvegarde -Name[ja]=ã·ã¹ãã ã®ãªã¹ãã¢ -GenericName[ja]=ããã¯ã¢ããã»ã¢ã¼ã«ã¤ããããã¡ã¤ã«ããªã¹ãã¢ããã -Name[lt]=Atkurti sistemÄ -GenericName[lt]=Atkurti bylas iÅ¡ archyvo -Name[ru]=ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ -GenericName[ru]=ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ°Ð¹Ð»Ñ Ð¸Ð· Ð°ÑÑÐ¸Ð²Ð° ÑÐµÐ·ÐµÑÐ²Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ -Name[sl]=Obnovi sistem -GenericName[sl]=Obnovi datoteke iz varnostnega arhiva -Name[tr]=Sistem geri yÃ¼kleme -GenericName[tr]=DosyalarÄ± yedek arÅivinden geri yÃ¼kler X-KDE-SubstituteUID=true Modified: trunk/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.… ============================================================================== --- trunk/runlevel/package/yast2-runlevel.changes (original) +++ trunk/runlevel/package/yast2-runlevel.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Tue Mar 13 11:08:48 CET 2007 - locilka(a)suse.cz - Removed unneded BuildRequires (faster build) Modified: trunk/runlevel/src/runlevel.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/runlevel.desktop?re… ============================================================================== --- trunk/runlevel/src/runlevel.desktop (original) +++ trunk/runlevel/src/runlevel.desktop Fri May 25 13:39:58 2007 @@ -22,39 +22,4 @@ Name=System Services (Runlevel) GenericName=Configure runlevels -Name[cs]=Editor ÃºrovnÃ bÄhu -GenericName[cs]=Konfigurovat ÃºrovnÄ bÄhu -Name[de]=Runlevel-Editor -GenericName[de]=Runlevel konfigurieren -Name[es]=Editor de niveles de ejecuciÃ³n -GenericName[es]=Configurar niveles de ejecuciÃ³n -Name[hu]=FutÃ¡si szint szerkesztÅ -GenericName[hu]=FutÃ¡si szintek beÃ¡llÃtÃ¡sa -Name[it]=Editor dei runlevel -GenericName[it]=Configura runlevel -Name[ko]=ë°ë ë²¨ í¸ì§ê¸° -GenericName[ko]=ë°ë ë²¨ ì¤ì -Name[nl]=Runlevel editor -GenericName[nl]=Configureer runlevels -Name[pt]=Editor de Runlevel -GenericName[pt]=Configurar runlevels -Name[sk]=Editor ÃºrovnÃ -GenericName[sk]=KonfigurovaÅ¥ runlevel -Name[sv]=Editor fÃ¶r kÃ¶rnivÃ¥er -GenericName[sv]=StÃ¤ll in kÃ¶rnivÃ¥er -Name[bg]=Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ Ð·Ð° Ð½Ð¸Ð²Ð°ÑÐ° Ð½Ð° Ð·Ð°ÑÐµÐ¶Ð´Ð°Ð½Ðµ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð½Ð¸Ð²Ð°ÑÐ° Ð½Ð° Ð·Ð°ÑÐµÐ¶Ð´Ð°Ð½Ðµ -Name[da]=kÃ¸rselsniveau vÃ¦rktÃ¸j -GenericName[da]=Konfigurere kÃ¸rselsniveauer -Name[el]=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï runlevel -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· runlevels -Name[fr]=Ãditeur de niveaux d'exÃ©cution -GenericName[fr]=Configurer les niveaux d'exÃ©cution -Name[ja]=ã©ã³ã¬ãã«ã»ã¨ãã£ã¿ã¼ -GenericName[ja]=ã©ã³ã¬ãã«ãè¨å®ãã -GenericName[lt]=KonfigÅ«ruoti paleisties lygmenis -Name[sl]=Urejevalnik Delovnih Nivojev -GenericName[sl]=Nastavi delovne nivoje -Name[tr]=ÃalÄ±Åma dÃ¼zeyi dÃ¼zenleyicisi -GenericName[tr]=ÃalÄ±Åma dÃ¼zeylerini yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.ch… ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Tue Apr 17 14:33:29 CEST 2007 - jsmeix(a)suse.de - V 2.15.1 Modified: trunk/scanner/src/scanner.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/src/scanner.desktop?rev=… ============================================================================== --- trunk/scanner/src/scanner.desktop (original) +++ trunk/scanner/src/scanner.desktop Fri May 25 13:39:58 2007 @@ -21,33 +21,4 @@ Name=Scanner GenericName=Configure a scanner -Name[cs]=Skener -GenericName[cs]=Konfigurace skeneru -GenericName[de]=Konfiguration des Scanners -Name[es]=EscÃ¡ner -GenericName[es]=ConfiguraciÃ³n del escÃ¡ner -Name[hu]=LapolvasÃ³ -GenericName[hu]=LapolvasÃ³ beÃ¡llÃtÃ¡s -GenericName[it]=Configurazione scanner -Name[ko]=ì¤ìºë -GenericName[ko]=ì¤ìºë ì¤ì -GenericName[nl]=Scanner configuratie -GenericName[pt]=ConfiguraÃ§Ã£o do scanner -Name[sk]=Skener -GenericName[sk]=Nastavenie skeneru -Name[sv]=BildlÃ¤sare -GenericName[sv]=StÃ¤ll in bildlÃ¤sare -Name[da]=Skanner -GenericName[da]=Skanner konfiguration -Name[el]=Î£Î±ÏÏÏÎ®Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÎ±ÏÏÏÎ® -Name[fr]=Scanneur -GenericName[fr]=Configuration du scanneur -Name[ja]=ã¹ãã£ã -GenericName[ja]=ã¹ãã£ãã®è¨å® -Name[lt]=Skeneris -GenericName[lt]=Skenerio konfigÅ«ravimas -Name[sl]=OptiÄni bralnik (scanner) -GenericName[sl]=Nastavitev optiÄnega bralnika (scannerja) -Name[tr]=TarayÄ±cÄ± -GenericName[tr]=TarayÄ±cÄ± yapÄ±landÄ±rmasÄ± + Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Jan 17 11:01:08 CET 2007 - jsuchome(a)suse.cz - fixed help text to mention GDM (#216915) Modified: trunk/security/src/security.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/security.desktop?re… ============================================================================== --- trunk/security/src/security.desktop (original) +++ trunk/security/src/security.desktop Fri May 25 13:39:58 2007 @@ -23,38 +23,4 @@ Name=Local Security GenericName=Configure local security settings -Name[cs]=NastavenÃ bezpeÄnosti -GenericName[cs]=Konfigurovat lokÃ¡lnÃ nastavenÃ bezpeÄnosti -Name[de]=Einstellungen zur Sicherheit -GenericName[de]=Konfiguration aller lokalen Sicherheitseinstellungen -Name[es]=Configuracion de Seguridad -GenericName[es]=Configurar las opciones de seguridad local -Name[hu]=BiztonsÃ¡gi beÃ¡llÃtÃ¡sok -GenericName[hu]=A helyi biztonsÃ¡gi opciÃ³k beÃ¡llÃtÃ¡sa -Name[it]=Impostazioni sicurezza -GenericName[it]=Configurare le impostazioni di sicurezza locale -Name[ko]=ë³´ì ì¤ì -GenericName[ko]=ë¡ì»¬ ë³´ì ì¤ì ì ë§ëëë¤ -Name[nl]=Beveiligingsinstellingen -GenericName[nl]=Configureer lokale beveiligingsinstellingen -Name[pt]=ConfiguraÃ§Ãµes de SeguranÃ§a -GenericName[pt]=Configure informaÃ§Ãµes locais de seguranÃ§a -Name[sk]=Nastavenie zabezpeÄenia -GenericName[sk]=Nastavenie moÅ¾nostÃ lokÃ¡lneho zabezpeÄenia -Name[sv]=SÃ¤kerhetsinstÃ¤llningar -GenericName[sv]=Anpassa lokala sÃ¤kerhetsinstÃ¤llningar -Name[da]=Sikkerhedsindstillinger -Name[el]=Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÎÏÏÎ±Î»ÎµÎ¯Î±Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÏÎµ ÏÎ»ÎµÏ ÏÎ¹Ï ÏÎ¿ÏÎ¹ÎºÎÏ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï -Name[fr]=ParamÃ¨tres de sÃ©curitÃ© -GenericName[fr]=Configurer les paramÃ¨tres de sÃ©curitÃ© locaux -Name[ja]=ã»ãã¥ãªãã£ã¼ã®è¨å® -GenericName[ja]=ãã¼ã«ã«ã»ãã¥ãªãã£ã¼ã«é¢ããè¨å® -Name[lt]=Apsaugos nuostatos -GenericName[lt]=KonfigÅ«ruoti vietinÄs apsaugos nuostatas -Name[ru]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÐ¸ -Name[sl]=Varnostne nastavitve -GenericName[sl]=Nastavi lokalne varnostne nastavitve -Name[tr]=GÃ¼venlik ayarlarÄ± -GenericName[tr]=Yerel gÃ¼venlik ayarlarÄ±nÄ± yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu May 24 10:26:39 CEST 2007 - lslezak(a)suse.cz - added minimal commandline mode support to 'joystick' (#269895) Modified: trunk/sound/sound/src/joystick.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/joystick.desktop… ============================================================================== --- trunk/sound/sound/src/joystick.desktop (original) +++ trunk/sound/sound/src/joystick.desktop Fri May 25 13:39:58 2007 @@ -21,29 +21,4 @@ Name=Joystick GenericName=Configure a joystick attached to the sound card -GenericName[cs]=Konfigurovat joystick pÅipojenÃ½ ke zvukovÃ© kartÄ -GenericName[de]=An Soundkarte angeschlossenen Joystick konfigurieren -GenericName[es]=Configurar el joystick conectado a la tarjeta de sonido -Name[hu]=BotkormÃ¡ny -GenericName[hu]=HangkÃ¡rtyÃ¡hoz csatlakozÃ³ botkormÃ¡ny beÃ¡llÃtÃ¡sa -GenericName[it]=Configura joystick collegato alla scheda sonora -Name[ko]=ì¡°ì´ì¤í± -GenericName[ko]=ì¬ì´ë ì¹´ëì ë´ì¥ë ì¡°ì´ì¤í± ì¤ì -GenericName[nl]=Configureer de joystick die verbonden is met de geluidskaart -GenericName[pt]=Configurar joystick associado a placa de som -GenericName[sk]=NastaviÅ¥ joystick pripojenÃ½ na zvukovÃº kartu -GenericName[sv]=StÃ¤ll in joystick fastsatt i ljudkort -Name[bg]=ÐÐ¶Ð¾Ð¹ÑÑÐ¸Ðº -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹Ð²Ð°Ð½Ðµ Ð½Ð° Ð´Ð¶Ð¾Ð¹ÑÑÐ¸ÐºÐ°, ÐºÐ¾Ð¹ÑÐ¾ Ðµ ÑÐ²ÑÑÐ·Ð°Ð½ ÐºÑÐ¼ Ð·Ð²ÑÐºÐ¾Ð²Ð°ÑÐ° ÐºÐ°ÑÑÐ° -GenericName[da]=Konfigurere joystick tilsluttet et lydkort -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÏÎµ ÏÎ¿ joystick ÏÎ¿Ï ÎµÎ¯Î½Î±Î¹ ÏÏÎ½Î´ÎµÎ´ÎµÎ¼ÎÎ½Î¿ ÏÏÎ·Î½ ÎºÎ¬ÏÏÎ± Î®ÏÎ¿Ï -GenericName[fr]=Configurer le joystick connectÃ© Ã la carte son -Name[ja]=ã¸ã§ã¤ã¹ãã£ãã¯ -GenericName[ja]=ãµã¦ã³ãã»ã«ã¼ãã¨æ¥ç¶ããã¦ããã¸ã§ã¤ã¹ãã£ãã¯ã®è¨å® -Name[lt]=VairalazdÄ -GenericName[lt]=KonfigÅ«ruoti vairalazdÄ, prijungtÄ prie garso plokÅ¡tÄs -Name[sl]=Igralna palica -GenericName[sl]=Nastavitev igralne palice, ki je prikljuÄena na zvoÄno kartico -Name[tr]=Oyun Ã§ubuÄu -GenericName[tr]=Ses kartÄ±na baÄlÄ± olan oyun Ã§ubuÄunu yapÄ±landÄ±rÄ±r X-KDE-SubstituteUID=true Modified: trunk/sound/sound/src/sound.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/sound.desktop?re… ============================================================================== --- trunk/sound/sound/src/sound.desktop (original) +++ trunk/sound/sound/src/sound.desktop Fri May 25 13:39:58 2007 @@ -21,40 +21,4 @@ Name=Sound GenericName=Configure your sound card -Name[cs]=ZvukovÃ¡ karta -GenericName[cs]=Konfigurujte vaÅ¡i zvukovou kartu -GenericName[de]=Konfigurieren Sie Ihre Soundkarte -Name[es]=Sonido -GenericName[es]=Configure su tarjeta de sonido -Name[hu]=Hang -GenericName[hu]=HangkÃ¡rtya beÃ¡llÃtÃ¡sa -Name[it]=Suono -GenericName[it]=Configura la scheda sonora -Name[ko]=ì¬ì´ë -GenericName[ko]=ì¬ì©ì ì¬ì´ë ì¹´ë ì¤ì -Name[nl]=Geluid -GenericName[nl]=Configureer uw geluidskaart -Name[pt]=Som -GenericName[pt]=Configure sua placa de som -Name[sk]=Zvuk -GenericName[sk]=Nastavenie zvukovek karty -Name[sv]=Ljud -GenericName[sv]=StÃ¤ll in ljudkort -Name[bg]=ÐÐ²ÑÐº -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹Ð²Ð°Ð½Ðµ Ð½Ð° Ð·Ð²ÑÐºÐ¾Ð²Ð°ÑÐ° ÐºÐ°ÑÑÐ° -Name[da]=Lyd -GenericName[da]=Konfigurere dit lydkort -Name[el]=ÎÏÎ¿Ï -GenericName[el]=Î¡ÏÎ¸Î¼Î¯ÏÏÎµ ÏÎ·Î½ ÎºÎ¬ÏÏÎ± Î®ÏÎ¿Ï -Name[fr]=Son -GenericName[fr]=Configurer la carte son -Name[ja]=ãµã¦ã³ã -GenericName[ja]=ãµã¦ã³ãã»ã«ã¼ãã®è¨å® -Name[lt]=Garsas -GenericName[lt]=KonfigÅ«ruoti jÅ«sÅ³ garso plokÅ¡tÄ -Name[ru]=ÐÐ²ÑÐº -Name[sl]=Zvok -GenericName[sl]=Nastavi zvoÄno kartico -Name[tr]=Ses -GenericName[tr]=Ses kartÄ±nÄ±zÄ± yapÄ±landÄ±rÄ±r X-KDE-SubstituteUID=true Modified: trunk/storage/controller/src/controller.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/controller/src/controlle… ============================================================================== --- trunk/storage/controller/src/controller.desktop (original) +++ trunk/storage/controller/src/controller.desktop Fri May 25 13:39:58 2007 @@ -21,36 +21,4 @@ Name=Disk Controller GenericName=Configure the disk controller -Name[cs]=DiskovÃ½ ÅadiÄ -GenericName[cs]=SprÃ¡va diskovÃ©ho ÅadiÄe (naÄÃtÃ¡nÃ modulÅ¯ a parametry) -Name[de]=Festplatten-Controller -GenericName[de]=Umgang mit dem Festplatten-Controller (Laden von Modulen und Parametern) -Name[es]=Controlador de disco -GenericName[es]=Manejo del controlador de disco (carga de mÃ³dulos y parÃ¡metros) -Name[hu]=LemezvezÃ©rlÅ -GenericName[hu]=Merevlemez vezÃ©rlÅ kezelÃ©se (modulok betÃ¶ltÃ©se Ã©s annak paramÃ©terei) -Name[it]=Controller di disco -GenericName[it]=Gestione del controller del disco (caricare moduli e parametri) -Name[ko]=ëì¤í¬ ì»¨í¸ë¡¤ë¬ -GenericName[ko]=ëì¤í¬ ì»¨í¸ë¡¤ë¬ ì ì´(ëª¨ë ì ì¬ì ë§¤ê°ë³ì ì§ì ) -Name[nl]=Disk controller -GenericName[nl]=Disk controller besturing (module laden en parameters) -Name[pt]=Controladora de Disco -GenericName[pt]=Gerenciamento de Controladora de Disco (carga de mÃ³dulo e parÃ¢metros) -Name[sk]=RadiÄ disku -GenericName[sk]=Podpora radiÄa disku (naÄÃtanie modulu a jeho parametre) -Name[sv]=Diskstyrenhet -GenericName[sv]=Hantering av diskstyrenhet (modulladdning och parametrar) -Name[el]=ÎÎ»ÎµÎ³ÎºÏÎ®Ï ÎÎ¯ÏÎºÎ¿Ï -GenericName[el]=Î§ÎµÎ¹ÏÎ¹ÏÎ¼ÏÏ ÎÎ»ÎµÎ³ÎºÏÎ® ÎÎ¯ÏÎºÎ¿Ï (ÏÏÏÏÏÏÎ· Î¼Î¿Î½Î¬Î´Î±Ï ÎºÎ±Î¹ ÏÎ±ÏÎ±Î¼ÎÏÏÏÎ½) -Name[fr]=ContrÃ´leur disque -GenericName[fr]=Administration du contrÃ´leur disque (chargement du module et paramÃ¨tres) -Name[ja]=ãã£ã¹ã¯ã»ã³ã³ããã¼ã© -GenericName[ja]=ãã£ã¹ã¯ã»ã³ã³ããã¼ã©ã®è¨å® (ã¢ã¸ã¥ã¼ã«ã®ãã¼ãã¨ã¢ã¸ã¥ã¼ã«ã®å¼æ°) -Name[lt]=Disko valdiklis -GenericName[lt]=Disko valdiklio valdymas (moduliÅ³ Ä¯kÄlimas ir parametrai) -Name[sl]=Krmilnik diska -GenericName[sl]=Upravljanje s krmilnikom diska (parametri in nalaganje modulov) -Name[tr]=Disk denetleyicisi -GenericName[tr]=Disk denetleyicisi kullanÄ±mÄ± (modÃ¼l yÃ¼kleme ve parametreleri) X-KDE-SubstituteUID=true Modified: trunk/storage/disk/src/disk.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/disk/src/disk.desktop?re… ============================================================================== --- trunk/storage/disk/src/disk.desktop (original) +++ trunk/storage/disk/src/disk.desktop Fri May 25 13:39:58 2007 @@ -21,37 +21,4 @@ Name=Partitioner GenericName=Partition hard disks (including RAID, LVM, and encrypted file systems) -Name[cs]=RozdÄlovÃ¡nÃ disku -GenericName[cs]=RozdÄlovÃ¡nÃ pevnÃ½ch diskÅ¯ (vÄetnÄ RAID, LVM, Å¡ifrovanÃ½ch systÃ©mÅ¯ ...) -Name[de]=Partitionieren -GenericName[de]=Festplattenpartitionierung (einschlieÃlich RAID, LVM, verschlÃ¼sselte Dateisysteme...) -Name[es]=Particionador -GenericName[es]=Particionamiento del disco duro (incluyendo RAID, LVM, sistemas de archivos codificados) -Name[hu]=ParticionÃ¡lÃ¡s -GenericName[hu]=Merevlemez particionÃ¡lÃ¡s (beleÃ©rtve RAID-et, LVM-et, titkosÃtott fÃ¡jlrendszert) -Name[it]=Partizionatore -GenericName[it]=Partizionamento dischi rigidi (inclusi RAID, LVM e filesystem cifrati) -Name[ko]=íí°ì ëêµ¬ -GenericName[ko]=íëëì¤í¬ íí°ì( RAID, LVM, ìí¸íë íì¼ ìì¤íì í¬í¨) -GenericName[nl]=Harddisk partitionering (inclusief RAID, LVM, versleutelde bestandssystemen) -Name[pt]=Particionador -GenericName[pt]=Particionamento de disco rÃgido (incluindo RAID, LVM, sistema de arquivos criptografado) -Name[sk]=Rozdelenie disku -GenericName[sk]=Rozdelenie disku (vrÃ¡tane RAID, LVM, Å¡ifrovanÃ½ch systÃ©mov sÃºborov) -Name[sv]=Partitionerare -GenericName[sv]=HÃ¥rddiskpartitionering (inklusive RAID, LVM, krypterade filsystem) -GenericName[da]=Harddisk partitionering (inklusiv RAID, LVM, krypteret filsystem) -Name[el]=ÎÎ±ÏÎ±ÏÎ¼Î·ÏÎ®Ï -GenericName[el]=ÎÎ±ÏÎ¬ÏÎ¼Î·ÏÎ· Î£ÎºÎ»Î·ÏÎ¿Ï ÎÎ¯ÏÎºÎ¿Ï (ÏÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ RAID, LVM, ÎºÏÏÏÏÎ¿Î³ÏÎ±ÏÎ·Î¼ÎÎ½Î± ÏÏÏÏÎ®Î¼Î±ÏÎ± Î±ÏÏÎµÎ¯ÏÎ½) -Name[fr]=Partitionneur -GenericName[fr]=Partitionnement du disque dur (incluant RAID, LVM, systÃ¨mes de fichiers cryptÃ©s) -Name[ja]=ãã£ã¹ã¯ã®åå² -GenericName[ja]=ãã¼ããã£ã¹ã¯ã®åå² (RAIDãLVMãæå·ãã¡ã¤ã«ã·ã¹ãã ç) -Name[lt]=Skaidymo Ä¯rankis -GenericName[lt]=Kietojo disko skaidymas (Ä¯skaitant RAID, LVM, koduotas bylÅ³ sistemas) -Name[ru]=Ð Ð°Ð·Ð±Ð¸ÐµÐ½Ð¸Ðµ -Name[sl]=Particioniranje -GenericName[sl]=Particioniranje trdih diskov (tudi RAID, LVM, kodirani datoteÄni sistemi) -Name[tr]=Disk bÃ¶lÃ¼mlendiricisi -GenericName[tr]=Sabit disk bÃ¶lÃ¼mlendirme iÅlemleri (RAID, LVM ve ÅifrelenmiÅ dosya sistemi dahil) X-KDE-SubstituteUID=true Modified: trunk/storage/lvm/src/lvm_config.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/lvm/src/lvm_config.deskt… ============================================================================== --- trunk/storage/lvm/src/lvm_config.desktop (original) +++ trunk/storage/lvm/src/lvm_config.desktop Fri May 25 13:39:58 2007 @@ -21,24 +21,4 @@ Name=LVM GenericName=Create and configure volume groups and physical and logical volumes -GenericName[cs]=VytvoÅit a nastavit skupiny svazkÅ¯ (fyzickÃ© a logickÃ©) -GenericName[de]=Volume-Gruppen sowie Physical Volumes und Logical Volumes erzeugen und konfigurieren. -GenericName[es]=Crear y configurar grupos de volÃºmenes y volÃºmenes fÃsicos y lÃ³gicos -Name[hu]=LVM beÃ¡llÃtÃ¡sa -GenericName[hu]=KÃ¶tetcsoportok, fizikai Ã©s logikai kÃ¶tetek lÃ©trehozÃ¡sa Ã©s beÃ¡llÃtÃ¡sa -GenericName[it]=Crea e configura gruppi di volumi e volumi fisici o logici -Name[ko]=LVM(ë¼ë¦¬ì ë³¼ë¥¨ë§¤ëì ) -GenericName[ko]=ë¬¼ë¦¬ì í¹ì ë¼ë¦¬ì ë³¼ë¥¨ì ìì±íê³ íê²½ì¤ì í©ëë¤. -GenericName[nl]=Maak en configureer volume groepen en fysieke en logische volumes -GenericName[pt]=Criar e configurar grupos de volume e volumes lÃ³gicos e fÃsicos -GenericName[sk]=VytvÃ¡ra a nastavuje skupiny diskov a fyzickÃ© a logickÃ© disky -GenericName[sv]=Skapa och stÃ¤ll in volymgrupper samt fysiska och logiska volymer -GenericName[da]=Opret og konfigurer volume grupper og fysiske og logiske volumer -GenericName[el]=ÎÎ·Î¼Î¹Î¿ÏÏÎ³Î¯Î± ÎºÎ±Î¹ ÏÏÎ¸Î¼Î¹ÏÎ· Î¿Î¼Î¬Î´Î±Ï ÏÏÎ¼ÏÎ½ ÎºÎ±Î¹ ÏÏÏÎ¹ÎºÏÎ½ ÎºÎ±Î¹ Î»Î¿Î³Î¹ÎºÏÎ½ ÏÏÎ¼ÏÎ½ -Name[fr]=&Partitionnement -GenericName[fr]=CrÃ©er et configurer des groupes de volumes, des volumes physiques et logiques -GenericName[ja]=ããªã¥ã¼ã ã»ã°ã«ã¼ããç©çããªã¥ã¼ã ãè«çããªã¥ã¼ã ã®ä½æã¨è¨å®ã -GenericName[lt]=Sukurti ir konfigÅ«ruoti tomÅ³ grupes ir fizinius bei loginius tomus -GenericName[sl]=Ustvari in nastavi skupine nosilcev in fiziÄni in logiÄni nosilci -GenericName[tr]=YÄ±ÄÄ±n gruplarÄ±, fiziksel ve mantÄ±ksal yÄ±ÄÄ±nlar oluÅturur ve yapÄ±landÄ±rÄ±r X-KDE-SubstituteUID=true Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu May 24 11:25:44 CEST 2007 - fehr(a)suse.de - add evms-devel to needforbuild Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.ch… ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed May 2 11:20:41 CEST 2007 - varkoly(a)suse.de - Bug 269907 - yast support does not understand the "help" option Modified: trunk/support/src/support.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/support.desktop?rev=… ============================================================================== --- trunk/support/src/support.desktop (original) +++ trunk/support/src/support.desktop Fri May 25 13:39:58 2007 @@ -21,40 +21,4 @@ Name=Support Query GenericName=Collect basic information for your support request -Name[cs]=Dotaz na podporu -GenericName[cs]=Zaslat online dotaz na portÃ¡l podpory SuSE -Name[de]=Support-Anfrage -GenericName[de]=Grundlegende Systeminformationen fÃ¼r Ihre Support-Anfrage -Name[en]=Post a Support Query -Name[es]=Enviar una peticiÃ³n de soporte -GenericName[es]=Envie una peticiÃ³n en-linea a la pÃ¡gina del soporte de SuSE -Name[hu]=TelepÃtÃ©si kÃ©rdÃ©s kÃ¼ldÃ©se -GenericName[hu]=Online kÃ©rdÃ©s kÃ¼ldÃ©se a SuSE termÃ©ktÃ¡mogatÃ¡snak -Name[it]=Inviate una domanda al supporto -GenericName[it]=Inviate una richiesta online al portale di supporto SuSE -Name[ko]=ì§ì ìì² ë±ë¡ -GenericName[ko]=ì§ë¬¸ì ì¨ë¼ì¸ì¼ë¡ SuSE ì§ìì¼í°ì ë³´ë´ê¸° -Name[nl]=Verstuur een ondersteuningsvraag -GenericName[nl]=Verstuur een online vraag naar het SuSE ondersteuningsportaal -Name[pt]=Submeta uma pergunta de suporte -GenericName[pt]=Envie uma pergunta online para o portal de suporte SuSE -Name[sk]=OtÃ¡zka na podporu -GenericName[sk]=PoslaÅ¥ otÃ¡zku podpore SuSE cez portÃ¡l -Name[sv]=Skicka en frÃ¥ga till supporten -GenericName[sv]=Skicka en online-frÃ¥ga till SuSE:s supportportal -Name[da]=Send et supportspÃ¸rgsmÃ¥l -GenericName[da]=Send et online-spÃ¸rgsmÃ¥l til SuSEs supportportal -Name[el]=Î¤Î±ÏÏÎ´ÏÎ¿Î¼Î®ÏÏÎµ Î¼Î¹Î± ÎµÏÏÏÎ·ÏÎ· ÏÏÎ¿ÏÏÎ®ÏÎ¹Î¾Î·Ï -GenericName[el]=Î£ÏÎµÎ¯Î»ÏÎµ Î¼Î¹Î± online ÎµÏÏÏÎ·ÏÎ· ÏÏÎ¿Î½ Î´Î¹ÎºÏÏÎ±ÎºÏ ÏÏÏÎ¿ ÏÏÎ¿ÏÏÎ®ÏÎ¹Î¾Î·Ï ÏÎ·Ï SuSE -Name[en]=Post a Support Query -Name[fr]=Envoyer une requÃªte d'assistance technique -GenericName[fr]=Envoyer une requÃªte en ligne au portail d'assistance de SuSE -Name[ja]=æè¡ãµãã¼ãã¸è³ªåãéä¿¡ããã -GenericName[ja]=SuSE ã®æè¡ãµãã¼ãã¸è³ªåãéä¿¡ããã -Name[lt]=IÅ¡siÅ³sti uÅ¾klausÄ -GenericName[lt]=SiÅ³sti uÅ¾klausÄ SuSE pagalbos portalui -Name[sl]=PoÅ¡lji zahtevo o podpori -GenericName[sl]=PoÅ¡lji zahtevo o podpori po liniji na SuSE podporni portal. -Name[tr]=Destek isteÄi yolla -GenericName[tr]=SuSE destek merkezine Ã§evrimiÃ§i bir istek yollayÄ±n X-KDE-SubstituteUID=true Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfi… ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Wed Apr 11 14:08:40 CEST 2007 - lslezak(a)suse.cz - dropped yast2-powertweak subpackage (FATE #301978) Modified: trunk/sysconfig/src/sysconfig.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/sysconfig.desktop?… ============================================================================== --- trunk/sysconfig/src/sysconfig.desktop (original) +++ trunk/sysconfig/src/sysconfig.desktop Fri May 25 13:39:58 2007 @@ -22,39 +22,4 @@ Name=/etc/sysconfig Editor GenericName=Change settings in /etc/sysconfig configuration files -Name[cs]=Editor souborÅ¯ /etc/sysconfig -GenericName[cs]=ZmÄnit nastavenÃ v souborech /etc/sysconfig -Name[de]=Editor fÃ¼r /etc/sysconfig-Dateien -GenericName[de]=Einstellungen in den Konfigurationsdateien von /etc/sysconfig Ã¤ndern -Name[es]=Editor para los archivos /etc/sysconfig -GenericName[es]=Cambiar la configuraciÃ³n en los archivos de /etc/sysconfig -Name[hu]=/etc/sysconfig szerkesztÅ -GenericName[hu]=BeÃ¡llÃtÃ¡sok megvÃ¡ltoztatÃ¡sa az /etc/sysconfig kÃ¶nyvtÃ¡r beÃ¡llÃtÃ¡si fÃ¡jljaiban -Name[it]=Editor per file /etc/sysconfig -GenericName[it]=Cambia le impostazioni nei file di configurazione in /etc/sysconfig -Name[ko]=/etc/sysconfig íì¼ í¸ì§ê¸° -GenericName[ko]=/etc/sysconfig êµ¬ì± íì¼ë¤ìì ì¤ì ë¤ì ë³ê²½í©ëë¤ -Name[nl]=Editor voor /etc/sysconfig bestanden -GenericName[nl]=Wijzig instellingen in /etc/sysconfig configuratie-bestanden -Name[pt]=Editor para arquivos /etc/sysconfig -GenericName[pt]=Mude configuraÃ§Ãµes nos arquivos do /etc/Sysconfig. -Name[sk]=Editor pre sÃºbory /etc/sysconfig -GenericName[sk]=Zmena nastavenia v konfiguraÄnÃ½ch sÃºboroch /etc/sysconfig -Name[sv]=Editor fÃ¶r /etc/sysconfig-filer -GenericName[sv]=Ãndra instÃ¤llningar i /etc/sysconfig-instÃ¤llningsfiler -GenericName[da]=Ãndre indstillinger i /etc/sysconfig konfigurationsfiler -Name[el]=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï Î³Î¹Î± ÏÎ± Î±ÏÏÎµÎ¯Î± ÏÎ¿Ï /etc/sysconfig -GenericName[el]=ÎÎ»Î»Î±Î³Î® ÏÏÎ¸Î¼Î¯ÏÎµÏÎ½ ÏÏÎ± Î±ÏÏÎµÎ¯Î± /etc/sysconfig -Name[fr]=Ãditeur pour fichiers /etc/sysconfig -GenericName[fr]=Changer les paramÃ¨tres dans les fichiers de configuration /etc/sysconfig -Name[ja]=/etc/sysconfig ã¨ãã£ã¿ã¼ -GenericName[ja]=/etc/sysconfig è¨å®ãã¡ã¤ã«ãå¤æ´ããã -Name[lt]=/etc/sysconfig bylÅ³ redaktorius -GenericName[lt]=Pakeisti nuostatas /etc/sysconfig konfigÅ«racijos bylose -Name[ru]=Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ Ð´Ð»Ñ ÑÐ°Ð¹Ð»Ð¾Ð² /etc/sysconfig -GenericName[ru]=ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð² /etc/sysconfig ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¾Ð½Ð½ÑÑ ÑÐ°Ð¹Ð»Ð°Ñ -Name[sl]=Urejevalnik za datoteke v imeniku /etc/sysconfig -GenericName[sl]=Spremeni nastavitve v datotekah v imeniku /etc/sysconfig -Name[tr]=/etc/sysconfig dosyalarÄ± dÃ¼zenleyicisi -GenericName[tr]=/etc/sysconfig yapÄ±landÄ±rma dosyalarÄ±nÄ±daki ayarlarÄ± deÄiÅtirir X-KDE-SubstituteUID=true Modified: trunk/tune/hwinfo/src/hwinfo.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/hwinfo.desktop?r… ============================================================================== --- trunk/tune/hwinfo/src/hwinfo.desktop (original) +++ trunk/tune/hwinfo/src/hwinfo.desktop Fri May 25 13:39:58 2007 @@ -21,40 +21,4 @@ Name=Hardware Information GenericName=View hardware information -Name[cs]=Informace o hardwaru -GenericName[cs]=Zobrazit informace o hardwaru -Name[de]=Hardware-Informationen -GenericName[de]=Hardware-Informationen anzeigen -Name[en]=Hardware Information -Name[es]=InformaciÃ³n sobre el hardware -GenericName[es]=Mostrar informaciÃ³n sobre el hardware -Name[hu]=Hardver informÃ¡ciÃ³ -GenericName[hu]=Hardver informÃ¡ciÃ³k megjelenÃtÃ©se -Name[it]=Mostra informazioni hardware -GenericName[it]=Mostra informazioni hardware -Name[ko]=íëì¨ì´ ì ë³´ -GenericName[ko]=íëì¨ì´ ì ë³´ë¥¼ íìí©ëë¤ -Name[nl]=Hardware info -GenericName[nl]=Hardware info bekijken -Name[pt]=InformaÃ§Ã£o de Hardware -GenericName[pt]=Mostrar InformaÃ§Ã£o de Hardware -Name[sk]=InformÃ¡cie o hardware -GenericName[sk]=ZobraziÅ¥ informÃ¡cie o hardware -Name[sv]=HÃ¥rdvaruinformation -GenericName[sv]=Visa hÃ¥rdvaruinformation -Name[da]=Udstyrsinformation -GenericName[da]=Vis udstyrsinformation -Name[el]=Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÎ»Î¹ÎºÎ¿Ï -GenericName[el]=ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¹ÏÎ½ ÏÎ»Î¹ÎºÎ¿Ï -Name[en]=Hardware Information -Name[fr]=Informations sur le matÃ©riel -GenericName[fr]=Afficher les informations sur le matÃ©riel -Name[ja]=ãã¼ãã¦ã§ã¢æå ± -GenericName[ja]=ãã¼ãã¦ã§ã¢æå ±ã®è¡¨ç¤º -Name[lt]=Informacija apie Ä¯taisus -GenericName[lt]=Rodyti informacija apie Ä¯taisus -Name[sl]=Podatki o strojni opremi -GenericName[sl]=PrikaÅ¾i podatke o strojni opremi -Name[tr]=DonanÄ±m bilgisi -GenericName[tr]=DonanÄ±m bilgisini gÃ¶ster X-KDE-SubstituteUID=true Modified: trunk/tune/idedma/src/idedma.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/idedma/src/idedma.desktop?r… ============================================================================== --- trunk/tune/idedma/src/idedma.desktop (original) +++ trunk/tune/idedma/src/idedma.desktop Fri May 25 13:39:58 2007 @@ -21,35 +21,4 @@ Name=IDE DMA Mode GenericName=Configure the DMA mode of IDE devices -Name[cs]=ReÅ¾im IDE DMA -GenericName[cs]=NastavenÃ reÅ¾imu DMA pro IDE zaÅÃzenÃ -Name[de]=IDE DMA-Modus -GenericName[de]=DMA-Modus-Konfiguration von IDE-GerÃ¤ten -Name[es]=Modo IDE DMA -GenericName[es]=ConfiguraciÃ³n de modo DMA de dispositivos IDE -Name[hu]=IDE DMA mÃ³d -GenericName[hu]=DMA mÃ³d beÃ¡llÃtÃ¡sa IDE eszkÃ¶zÃ¶k szÃ¡mÃ¡ra -Name[it]=ModalitÃ DMA IDE -GenericName[it]=Configurazione della modalitÃ DMA dei dispositivi IDE -Name[ko]=IDE DMA ëª¨ë -GenericName[ko]=IDE ì¥ì¹ DMA ëª¨ë êµ¬ì± -Name[nl]=IDE DMA mode -GenericName[nl]=DMA mode configuratie van IDE apparaten -Name[pt]=Modo IDE DMA -GenericName[pt]=ConfiguraÃ§Ã£o do modo DMA de dispositivos IDE -Name[sk]=IDE DMA mÃ³d -GenericName[sk]=KonfigurÃ¡cia DMA mÃ³du IDE zariadenÃ -Name[sv]=LÃ¤ge fÃ¶r IDE DMA -GenericName[sv]=InstÃ¤llning av DMA-lÃ¤ge pÃ¥ IDE-enheter -GenericName[da]=Konfiguration af DMA-tilstand pÃ¥ IDE-enheder -Name[el]=ÎÎ±ÏÎ¬ÏÏÎ±ÏÎ· IDE DMA -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï DMA ÏÏÎ½ IDE ÏÏÏÎºÎµÏÏÎ½ -Name[fr]=Mode DMA IDE -GenericName[fr]=Mode de configuration DMA des pÃ©riphÃ©riques IDE -Name[ja]=IDE DMA ã¢ã¼ã -GenericName[ja]=IDE ããã¤ã¹ã® DMA ã¢ã¼ãã®è¨å® -GenericName[lt]=IDE Ä¯renginiÅ³ DMA veiksenos konfigÅ«ravimas -GenericName[sl]=Nastavitev DMA naÄina IDE naprav -Name[tr]=IDE DMA modu -GenericName[tr]=IDE aygÄ±tlarÄ±nÄ±n DMA modu yapÄ±landÄ±rmasÄ± X-KDE-SubstituteUID=true Modified: trunk/tune/package/yast2-tune.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/package/yast2-tune.changes?… ============================================================================== --- trunk/tune/package/yast2-tune.changes (original) +++ trunk/tune/package/yast2-tune.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu May 24 09:42:49 CEST 2007 - lslezak(a)suse.cz - added minimal command line mode support to 'hwinfo' (#269892) Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu Mar 22 11:11:20 CET 2007 - lslezak(a)suse.cz - updated TV card DB (linux-2.6.21-rc4-git5-2) Modified: trunk/tv/src/tv.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/tv.desktop?rev=38147&r1=3… ============================================================================== --- trunk/tv/src/tv.desktop (original) +++ trunk/tv/src/tv.desktop Fri May 25 13:39:58 2007 @@ -21,40 +21,4 @@ Name=TV Card GenericName=Configure a TV card -Name[cs]=TV karta -GenericName[cs]=Nastavit TV kartu -Name[de]=TV-Karte -GenericName[de]=TV-Karte konfigurieren -Name[en]=TV Card -Name[es]=Tarjeta de TV -GenericName[es]=Configurar tarjeta de TV -Name[hu]=TV-kÃ¡rtya -GenericName[hu]=TV- Ã©s rÃ¡diÃ³ kÃ¡rtya beÃ¡llÃtÃ¡sa -Name[it]=Scheda TV -GenericName[it]=Configurazione scheda TV -Name[ko]=TV ì¹´ë -GenericName[ko]=TV ì¹´ë ì¤ì -Name[nl]=TV kaart -GenericName[nl]=Configureer TV kaart -Name[pt]=Placa de TV -GenericName[pt]=Configurar placa de TV -Name[sk]=TV karta -GenericName[sk]=KonfigurovaÅ¥ TV kartu -Name[sv]=TV-kort -GenericName[sv]=StÃ¤ll in TV-kort -Name[da]=TV-kort -GenericName[da]=Konfigurer TV-kort -Name[el]=ÎÎ¬ÏÏÎ± TV -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÎºÎ¬ÏÏÎ±Ï TV -Name[en]=TV Card -Name[fr]=Carte TV -GenericName[fr]=Configurer la carte TV -Name[ja]=TV ã«ã¼ã -GenericName[ja]=TV ã«ã¼ãã®è¨å® -Name[lt]=TV plokÅ¡tÄ -GenericName[lt]=KonfigÅ«ruoti TV plokÅ¡tÄ -Name[sl]=TV kartica -GenericName[sl]=Nastavi TV kartico -Name[tr]=TV kartÄ± -GenericName[tr]=TV kartÄ±nÄ± yapÄ±landÄ±r X-KDE-SubstituteUID=true Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu May 24 15:58:42 CEST 2007 - jsuchome(a)suse.cz - check for crypted directories modifications before offering Modified: trunk/users/src/groups.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/groups.desktop?rev=381… ============================================================================== --- trunk/users/src/groups.desktop (original) +++ trunk/users/src/groups.desktop Fri May 25 13:39:58 2007 @@ -21,40 +21,4 @@ Name=Group Management GenericName=Add, Edit or Delete User Groups -Name[cs]=SprÃ¡vce skupin -GenericName[cs]=SprÃ¡vce skupin -Name[de]=Gruppen bearbeiten und anlegen -GenericName[de]=Gruppen bearbeiten und anlegen -Name[es]=Editar y crear grupos -GenericName[es]=Editar y crear grupos -Name[hu]=Csoportok lÃ©trehozÃ¡sa Ã©s mÃ³dosÃtÃ¡sa -GenericName[hu]=Csoportok lÃ©trehozÃ¡sa Ã©s mÃ³dosÃtÃ¡sa -Name[it]=Modifica e crea gruppi -GenericName[it]=Modifica e crea gruppi -Name[ko]=ê·¸ë£¹ í¸ì§/ìì± -GenericName[ko]=ê·¸ë£¹ í¸ì§/ìì± -Name[nl]=Wijzigen en aanmaken van groepen -GenericName[nl]=Wijzigen en aanmaken van groepen -Name[pt]=Editar e criar grupos -GenericName[pt]=Editar e criar grupos -Name[sk]=UpraviÅ¥ a vytvoriÅ¥ skupiny -GenericName[sk]=UpraviÅ¥ a vytvoriÅ¥ skupiny -Name[sv]=Redigera och skapa grupper -GenericName[sv]=Redigera och skapa grupper -Name[bg]=Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ°Ð½Ðµ Ð¸ ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð³ÑÑÐ¿Ð¸ -GenericName[bg]=Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ°Ð½Ðµ Ð¸ ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð³ÑÑÐ¿Ð¸ -Name[da]=RedigÃ©r og opret grupper -GenericName[da]=RedigÃ©r og opret grupper -Name[el]=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ ÎºÎ±Î¹ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÏÎµ Î¿Î¼Î¬Î´ÎµÏ -GenericName[el]=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ ÎºÎ±Î¹ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÏÎµ Î¿Î¼Î¬Î´ÎµÏ -Name[fr]=Modifier et crÃ©er des groupes -GenericName[fr]=Modifier et crÃ©er des groupes -Name[ja]=ã°ã«ã¼ããä½æãããã¯ç·¨éãã -GenericName[ja]=ã°ã«ã¼ããä½æãããã¯ç·¨éãã -Name[lt]=Keisti ir sukurti grupes -GenericName[lt]=Keisti ir sukurti grupes -Name[sl]=Uredi in kreiraj skupine -GenericName[sl]=Uredi in kreiraj skupine -Name[tr]=Grup ekle ve dÃ¼zenle -GenericName[tr]=Grup ekle ve dÃ¼zenle X-KDE-SubstituteUID=true Modified: trunk/users/src/users.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users.desktop?rev=3814… ============================================================================== --- trunk/users/src/users.desktop (original) +++ trunk/users/src/users.desktop Fri May 25 13:39:58 2007 @@ -25,40 +25,4 @@ Name=User Management GenericName=Add, Edit or Delete Users -Name[cs]=SprÃ¡vce uÅ¾ivatelÅ¯ -GenericName[cs]=SprÃ¡vce uÅ¾ivatelÅ¯ -Name[de]=Benutzer bearbeiten und anlegen -GenericName[de]=Benutzer bearbeiten und anlegen -Name[es]=Editar y crear usuarios -GenericName[es]=Editar y crear usuarios -Name[hu]=FelhasznÃ¡lÃ³k lÃ©trehozÃ¡sa Ã©s mÃ³dosÃtÃ¡sa -GenericName[hu]=FelhasznÃ¡lÃ³k lÃ©trehozÃ¡sa Ã©s mÃ³dosÃtÃ¡sa -Name[it]=Modifica e crea utenti -GenericName[it]=Modifica e crea utenti -Name[ko]=ì¬ì©ì í¸ì§/ìì± -GenericName[ko]=ì¬ì©ì í¸ì§/ìì± -Name[nl]=Wijzigen en aanmaken van gebruikers -GenericName[nl]=Wijzigen en aanmaken van gebruikers -Name[pt]=Editar e criar usuÃ¡rios -GenericName[pt]=Editar e criar usuÃ¡rios -Name[sk]=Ãprava a vytvÃ¡ranie pouÅ¾ÃvateÄ¾ov -GenericName[sk]=Ãprava a vytvÃ¡ranie pouÅ¾ÃvateÄ¾ov -Name[sv]=Redigera och skapa anvÃ¤ndare -GenericName[sv]=Redigera och skapa anvÃ¤ndare -Name[bg]=Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ°Ð½Ðµ Ð¸ ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ -GenericName[bg]=Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ°Ð½Ðµ Ð¸ ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ -Name[da]=RedigÃ©r og opret brugere -GenericName[da]=RedigÃ©r og opret brugere -Name[el]=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ ÎºÎ±Î¹ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÏÎµ ÏÏÎ®ÏÏÎµÏ -GenericName[el]=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎµÎ¯ÏÎµ ÎºÎ±Î¹ Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®ÏÏÎµ ÏÏÎ®ÏÏÎµÏ -Name[fr]=Modifier et crÃ©er des utilisateurs -GenericName[fr]=Modifier et crÃ©er des utilisateurs -Name[ja]=ã¦ã¼ã¶ãä½æãããã¯ç·¨éãã -GenericName[ja]=ã¦ã¼ã¶ãä½æãããã¯ç·¨éãã -Name[lt]=Keisti ir sukurti vartotojus -GenericName[lt]=Keisti ir sukurti vartotojus -Name[sl]=Uredi in kreiraj uporabnike -GenericName[sl]=Uredi in kreiraj uporabnike -Name[tr]=KullanÄ±cÄ± ekle ve dÃ¼zenle -GenericName[tr]=KullanÄ±cÄ± ekle ve dÃ¼zenle X-KDE-SubstituteUID=true Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Fri May 25 13:39:58 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (#271209) + +------------------------------------------------------------------- Thu May 24 11:46:33 CEST 2007 - ms(a)suse.de - 2.15.10 Modified: trunk/x11/src/config/x11.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/config/x11.desktop?rev=3… ============================================================================== --- trunk/x11/src/config/x11.desktop (original) +++ trunk/x11/src/config/x11.desktop Fri May 25 13:39:58 2007 @@ -24,42 +24,4 @@ Name=Graphics Card and Monitor GenericName=Configure the graphics card and monitor -Name[cs]=GrafickÃ¡ karta a monitor -GenericName[cs]=Konfigurovat grafickou kartu a monitor -Name[de]=Grafikkarte und Monitor -GenericName[de]=Grafikkarte und Monitor konfigurieren -Name[en]=Graphics Card and Monitor -Name[es]=Tarjeta grÃ¡fica y monitor -GenericName[es]=Configurar tarjeta grÃ¡fica y monitor -Name[hu]=VideokÃ¡rtya Ã©s monitor -GenericName[hu]=A videokÃ¡rtya Ã©s a monitor beÃ¡llÃtÃ¡sa -Name[it]=Scheda video e monitor -GenericName[it]=Configura la scheda video e il monitor -Name[ko]=ê·¸ëí½ ì¹´ëì ëª¨ëí° -GenericName[ko]=ê·¸ëí½ ì¹´ëì ëª¨ëí° ì¤ì -Name[nl]=Grafische kaart en monitor -GenericName[nl]=Configureer grafische kaart en monitor -Name[pt]=Placa de vÃdeo e monitor -GenericName[pt]=Configurar placa de vÃdeo e monitor -Name[sk]=GrafickÃ¡ karta a monitor -GenericName[sk]=KonfigurÃ¡cia grafickej karty monitora -Name[sv]=Grafikkort och bildskÃ¤rm -GenericName[sv]=StÃ¤ll in grafikkort och bildskÃ¤rm -Name[bg]=ÐÐ¸Ð´ÐµÐ¾ÐºÐ°ÑÑÐ° Ð¸ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ -GenericName[bg]=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð²Ð¸Ð´ÐµÐ¾ÐºÐ°ÑÑÐ° Ð¸ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ -Name[da]=Grafikkort og skÃ¦rm -GenericName[da]=Konfigurere grafikkort og skÃ¦rm -Name[el]=ÎÎ¬ÏÏÎ± Î³ÏÎ±ÏÎ¹ÎºÏÎ½ ÎºÎ±Î¹ Î¿Î¸ÏÎ½Î· -GenericName[el]=Î¡ÏÎ¸Î¼Î¹ÏÎ· ÏÎ·Ï ÎºÎ¬ÏÏÎ±Ï Î³ÏÎ±ÏÎ¹ÎºÏÎ½ ÎºÎ±Î¹ ÏÎ·Ï Î¿Î¸ÏÎ½Î·Ï -Name[en]=Graphics Card and Monitor -Name[fr]=Carte graphique et moniteur -GenericName[fr]=Configurer la carte graphique et le moniteur -Name[ja]=ã°ã©ãã£ãã¯ã«ã¼ãã¨ã¢ãã¿ã¼ -GenericName[ja]=ã°ã©ãã£ãã¯ã«ã¼ãã¨ã¢ãã¿ã¼ã®è¨å® -Name[lt]=Video plokÅ¡tÄ ir monitorius -GenericName[lt]=KonfigÅ«ruoti video plokÅ¡tÄ monitoriÅ³ -Name[sl]=GrafiÄka kartica in ekran -GenericName[sl]=Nastavi grafiÄno kartico in ekran -Name[tr]=Grafik kartÄ± ve monitÃ¶r -GenericName[tr]=Grafik kartÄ± ve monitÃ¶rÃ¼ yapÄ±landÄ±r X-KDE-SubstituteUID=true -- 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] r38146 - /tags/stable-2_14_5/registration/
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 12:53:01 2007 New Revision: 38146 URL: http://svn.opensuse.org/viewcvs/yast?rev=38146&view=rev Log: Created tag stable-2_14_5 for registration Added: tags/stable-2_14_5/registration/ - copied from r38145, trunk/registration/ -- 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] r38145 - in /trunk/registration: VERSION package/yast2-registration.changes
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 12:52:55 2007 New Revision: 38145 URL: http://svn.opensuse.org/viewcvs/yast?rev=38145&view=rev Log: bump Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=38145&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Fri May 25 12:52:55 2007 @@ -1 +1 @@ -2.14.4 +2.14.5 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri May 25 12:52:55 2007 @@ -2,6 +2,7 @@ Fri May 25 12:51:16 CEST 2007 - jsrain(a)suse.cz - removed X-SuSE-translate in order to build +- 2.14.5 ------------------------------------------------------------------- Mon Apr 2 17:09:52 CEST 2007 - jdsn(a)suse.de -- 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] r38144 - in /trunk/registration: package/yast2-registration.changes src/config/customer_center.desktop src/config/suse_register.desktop
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 12:51:34 2007 New Revision: 38144 URL: http://svn.opensuse.org/viewcvs/yast?rev=38144&view=rev Log: removed X-SuSE-translate in order to build Modified: trunk/registration/package/yast2-registration.changes trunk/registration/src/config/customer_center.desktop trunk/registration/src/config/suse_register.desktop Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri May 25 12:51:34 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 12:51:16 CEST 2007 - jsrain(a)suse.cz + +- removed X-SuSE-translate in order to build + +------------------------------------------------------------------- Mon Apr 2 17:09:52 CEST 2007 - jdsn(a)suse.de - fixed category in desktop files (#259914) Modified: trunk/registration/src/config/customer_center.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/customer… ============================================================================== --- trunk/registration/src/config/customer_center.desktop (original) +++ trunk/registration/src/config/customer_center.desktop Fri May 25 12:51:34 2007 @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-translate=true Type=Application Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Software; Modified: trunk/registration/src/config/suse_register.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/suse_reg… ============================================================================== --- trunk/registration/src/config/suse_register.desktop (original) +++ trunk/registration/src/config/suse_register.desktop Fri May 25 12:51:34 2007 @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-translate=true Type=Application Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Software; -- 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] r38143 - /tags/stable-2_15_1/power-management/
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 11:47:42 2007 New Revision: 38143 URL: http://svn.opensuse.org/viewcvs/yast?rev=38143&view=rev Log: Created tag stable-2_15_1 for power-management Added: tags/stable-2_15_1/power-management/ - copied from r38142, trunk/power-management/ -- 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] r38142 - in /trunk/power-management: VERSION package/yast2-power-management.changes
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 11:47:37 2007 New Revision: 38142 URL: http://svn.opensuse.org/viewcvs/yast?rev=38142&view=rev Log: bump Modified: trunk/power-management/VERSION trunk/power-management/package/yast2-power-management.changes Modified: trunk/power-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/VERSION?rev=381… ============================================================================== --- trunk/power-management/VERSION (original) +++ trunk/power-management/VERSION Fri May 25 11:47:37 2007 @@ -1 +1 @@ -2.15.0 +2.15.1 Modified: trunk/power-management/package/yast2-power-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/package/yast2-p… ============================================================================== --- trunk/power-management/package/yast2-power-management.changes (original) +++ trunk/power-management/package/yast2-power-management.changes Fri May 25 11:47:37 2007 @@ -2,6 +2,7 @@ Fri May 25 11:44:48 CEST 2007 - jsrain(a)suse.cz - removed translations from .desktop-file (#271209) +- 2.15.1 ------------------------------------------------------------------- Tue Mar 13 14:25:01 CET 2007 - jsrain(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] r38141 - in /trunk/power-management: package/yast2-power-management.changes src/power-management.desktop
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 11:45:08 2007 New Revision: 38141 URL: http://svn.opensuse.org/viewcvs/yast?rev=38141&view=rev Log: removed translations from .desktop-file (#271209) Modified: trunk/power-management/package/yast2-power-management.changes trunk/power-management/src/power-management.desktop Modified: trunk/power-management/package/yast2-power-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/package/yast2-p… ============================================================================== --- trunk/power-management/package/yast2-power-management.changes (original) +++ trunk/power-management/package/yast2-power-management.changes Fri May 25 11:45:08 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 25 11:44:48 CEST 2007 - jsrain(a)suse.cz + +- removed translations from .desktop-file (#271209) + +------------------------------------------------------------------- Tue Mar 13 14:25:01 CET 2007 - jsrain(a)suse.cz - added the .rnc file (#253599) Modified: trunk/power-management/src/power-management.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/power-management/src/power-manag… ============================================================================== --- trunk/power-management/src/power-management.desktop (original) +++ trunk/power-management/src/power-management.desktop Fri May 25 11:45:08 2007 @@ -23,31 +23,3 @@ Name=Power Management GenericName=Configure power management - -Name[bg]=Name(power-management.desktop): Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° ÐµÐ½ÐµÑÐ³Ð¸ÑÑÐ° -GenericName[bg]=GenericName(power-management.desktop): ÐÐ°ÑÑÑÐ¾Ð¹Ð²Ð°Ð½Ðµ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸ÐµÑÐ¾ Ð½Ð° ÐµÐ½ÐµÑÐ³Ð¸ÑÑÐ° -Name[cs]=SprÃ¡va napÃ¡jenÃ -GenericName[cs]=Nastavit sprÃ¡vu napÃ¡jenÃ -Name[de]=Power- Management -GenericName[de]=Power-Management konfigurieren -Name[es]=GestiÃ³n de energÃa -GenericName[es]=Configurar la gestiÃ³n de energÃa -Name[fr]=Gestion de l'alimentation -GenericName[fr]=Configurer la gestion de l'alimentation -Name[hu]=EnergiakezelÃ©s -GenericName[hu]=EnergiagazdÃ¡lkodÃ¡s beÃ¡llÃtÃ¡sa -Name[it]=Power Management -GenericName[it]=Configura power management -Name[ja]=é»æºç®¡ç -GenericName[ja]=é»æºç®¡çãè¨å® -Name[pl]=ZarzÄdzanie zasilaniem -GenericName[pl]=Konfiguruj zarzÄdzanie energiÄ -Name[pt_BR]=Gerenciamento de Energia -GenericName[pt_BR]=Configurar gerenciamento de energia -Name[sk]=SprÃ¡va napÃ¡jania -GenericName[sk]=KonfigurÃ¡cia sprÃ¡vy napÃ¡jania -Name[zh_CN]=çµæºç®¡ç -GenericName[zh_CN]=éç½®çµæºç®¡ç -Name[zh_TW]=é»æºç®¡ç -GenericName[zh_TW]=è¨å®é»æºç®¡ç -X-SuSE-translate=true -- 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] r38140 - /tags/stable-2_15_34/yast2/
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 11:11:31 2007 New Revision: 38140 URL: http://svn.opensuse.org/viewcvs/yast?rev=38140&view=rev Log: Created tag stable-2_15_34 for yast2 Added: tags/stable-2_15_34/yast2/ - copied from r38139, trunk/yast2/ -- 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] r38139 - in /trunk/yast2: VERSION package/yast2.changes
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 11:11:22 2007 New Revision: 38139 URL: http://svn.opensuse.org/viewcvs/yast?rev=38139&view=rev Log: bump Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=38139&r1=38138… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri May 25 11:11:22 2007 @@ -1 +1 @@ -2.15.33 +2.15.34 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri May 25 11:11:22 2007 @@ -3,6 +3,7 @@ - fixed spec file (removed duplicate .desktop files translations) - removed translations from .desktop-files (#271209) +- 2.15.34 ------------------------------------------------------------------- Mon May 21 16:04:31 CEST 2007 - 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] r38138 - in /trunk/yast2: ./ library/desktop/groups/ package/ remote/
by jsrain＠svn.opensuse.org 25 May '07

25 May '07

Author: jsrain Date: Fri May 25 11:01:22 2007 New Revision: 38138 URL: http://svn.opensuse.org/viewcvs/yast?rev=38138&view=rev Log: fixed spec file (removed duplicate .desktop files translations) removed translations from .desktop-files (#271209) Modified: trunk/yast2/library/desktop/groups/hardware.desktop trunk/yast2/library/desktop/groups/misc.desktop trunk/yast2/library/desktop/groups/network_devices.desktop trunk/yast2/library/desktop/groups/network_services.desktop trunk/yast2/library/desktop/groups/security.desktop trunk/yast2/library/desktop/groups/software.desktop trunk/yast2/library/desktop/groups/system.desktop trunk/yast2/package/yast2.changes trunk/yast2/remote/remotechooser.desktop trunk/yast2/remote/remoteinstall.desktop trunk/yast2/yast2.spec.in Modified: trunk/yast2/library/desktop/groups/hardware.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/har… ============================================================================== --- trunk/yast2/library/desktop/groups/hardware.desktop (original) +++ trunk/yast2/library/desktop/groups/hardware.desktop Fri May 25 11:01:22 2007 @@ -14,5 +14,4 @@ Icon=yast-hardware Name=Hardware -Name[cs]=Hardware X-KDE-SubstituteUID=true Modified: trunk/yast2/library/desktop/groups/misc.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/mis… ============================================================================== --- trunk/yast2/library/desktop/groups/misc.desktop (original) +++ trunk/yast2/library/desktop/groups/misc.desktop Fri May 25 11:01:22 2007 @@ -14,5 +14,4 @@ Icon=yast-misc Name=Miscellaneous -Name[cs]=RÅ¯znÃ© X-KDE-SubstituteUID=true Modified: trunk/yast2/library/desktop/groups/network_devices.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/net… ============================================================================== --- trunk/yast2/library/desktop/groups/network_devices.desktop (original) +++ trunk/yast2/library/desktop/groups/network_devices.desktop Fri May 25 11:01:22 2007 @@ -14,5 +14,4 @@ Icon=yast-network_devices Name=Network Devices -Name[cs]=SÃÅ¥ovÃ¡ zaÅÃzenÃ X-KDE-SubstituteUID=true Modified: trunk/yast2/library/desktop/groups/network_services.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/net… ============================================================================== --- trunk/yast2/library/desktop/groups/network_services.desktop (original) +++ trunk/yast2/library/desktop/groups/network_services.desktop Fri May 25 11:01:22 2007 @@ -14,5 +14,4 @@ Icon=yast-network_services Name=Network Services -Name[cs]=SÃÅ¥ovÃ© sluÅ¾by X-KDE-SubstituteUID=true Modified: trunk/yast2/library/desktop/groups/security.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/sec… ============================================================================== --- trunk/yast2/library/desktop/groups/security.desktop (original) +++ trunk/yast2/library/desktop/groups/security.desktop Fri May 25 11:01:22 2007 @@ -14,5 +14,4 @@ Icon=yast-security Name=Security and Users -Name[cs]=BezpeÄnost a uÅ¾ivatelÃ© X-KDE-SubstituteUID=true Modified: trunk/yast2/library/desktop/groups/software.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/sof… ============================================================================== --- trunk/yast2/library/desktop/groups/software.desktop (original) +++ trunk/yast2/library/desktop/groups/software.desktop Fri May 25 11:01:22 2007 @@ -14,5 +14,4 @@ Icon=yast-software Name=Software -Name[cs]=Software X-KDE-SubstituteUID=true Modified: trunk/yast2/library/desktop/groups/system.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/groups/sys… ============================================================================== --- trunk/yast2/library/desktop/groups/system.desktop (original) +++ trunk/yast2/library/desktop/groups/system.desktop Fri May 25 11:01:22 2007 @@ -14,5 +14,4 @@ Icon=yast-system Name=System -Name[cs]=SystÃ©m X-KDE-SubstituteUID=true Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri May 25 11:01:22 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 25 10:59:56 CEST 2007 - jsrain(a)suse.cz + +- fixed spec file (removed duplicate .desktop files translations) +- removed translations from .desktop-files (#271209) + +------------------------------------------------------------------- Mon May 21 16:04:31 CEST 2007 - kmachalkova(a)suse.cz - Do not show empty xmessage window if nothing is printed to stderr Modified: trunk/yast2/remote/remotechooser.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/remote/remotechooser.deskt… ============================================================================== --- trunk/yast2/remote/remotechooser.desktop (original) +++ trunk/yast2/remote/remotechooser.desktop Fri May 25 11:01:22 2007 @@ -21,38 +21,4 @@ Name=Remote Administration GenericName=Administer Remote Host -Name[cs]=VzdÃ¡lenÃ¡ sprÃ¡va -GenericName[cs]=SprÃ¡va vzdÃ¡lenÃ©ho poÄÃtaÄe -Name[de]=Verwaltung entfernter Rechner (remote) -GenericName[de]=Entfernten (remote) Rechner verwalten -Name[es]=AdministraciÃ³n remota -GenericName[es]=Administrar ordenador remoto -Name[hu]=TÃ¡voli karbantartÃ¡s -GenericName[hu]=Tartson karban egy tÃ¡voli gÃ©pet -Name[it]=Amministrazione remota -GenericName[it]=Amministrare host remoto -Name[ko]=ìê²© ê´ë¦¬ì -GenericName[ko]=ìê²© í¸ì¤í¸ ê´ë¦¬ì -Name[nl]=Remote beheer -GenericName[nl]=Remote host beheren -Name[pt]=AdministraÃ§Ã£o Remota -GenericName[pt]=Administrar Host remoto -Name[sk]=VzdialenÃ¡ administrÃ¡cia -GenericName[sk]=SprÃ¡va vzdialenÃ©ho poÄÃtaÄa -Name[sv]=FjÃ¤rradministration -GenericName[sv]=Administrera fjÃ¤rrdator -Name[bg]=ÐÑÐ´Ð°Ð»ÐµÑÐµÐ½Ð¾ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ -GenericName[bg]=Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½Ð° Ð¼Ð°ÑÐ¸Ð½Ð° -Name[da]=Fjern-Administration -GenericName[da]=Adminstrere Fjern-vÃ¦rt -Name[el]=ÎÏÎ¿Î¼Î±ÎºÏÏÏÎ¼ÎÎ½Î· Î´Î¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· -GenericName[el]=ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· ÎÏÎ¿Î¼Î±ÎºÏÏÏÎ¼ÎÎ½Î¿Ï ÎÏÎ¼Î²Î¿Ï -Name[fr]=Administration Ã distance -GenericName[fr]=Administrer l'hÃ´te distant -Name[ja]=ãªã¢ã¼ãç®¡ç -GenericName[ja]=ãªã¢ã¼ãã»ãã¹ããç®¡çãã -Name[sl]=Oddaljeno upravljanje -GenericName[sl]=Upravljanje oddaljenega gostitelja -Name[tr]=Uzaktan yÃ¶netim -GenericName[tr]=Uzak makine yÃ¶net X-KDE-SubstituteUID=true Modified: trunk/yast2/remote/remoteinstall.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/remote/remoteinstall.deskt… ============================================================================== --- trunk/yast2/remote/remoteinstall.desktop (original) +++ trunk/yast2/remote/remoteinstall.desktop Fri May 25 11:01:22 2007 @@ -21,38 +21,4 @@ Name=Remote Installation GenericName=Run Installation on Remote Host -Name[cs]=VzdÃ¡lenÃ¡ instalace -GenericName[cs]=Spustit instalaci na vzdÃ¡lenÃ©m poÄÃtaÄi -Name[de]=Installation von einem entfernten Rechner (remote) -GenericName[de]=Installation auf entferntem Rechner (remote) ausfÃ¼hren -Name[es]=InstalaciÃ³n remota -GenericName[es]=Realizar instalaciÃ³n en el ordenador remoto -Name[hu]=TÃ¡voli telepÃtÃ©s -GenericName[hu]=TelepÃtÃ©s indÃtÃ¡sa egy tÃ¡voli gÃ©pen -Name[it]=Installazione remota -GenericName[it]=Esegui installazione sull'host remoto -Name[ko]=ìê²© ì¤ì¹ -GenericName[ko]=ìê²© í¸ì¤í¸ìì ì¤ì¹ì¤í -Name[nl]=Remote installatie -GenericName[nl]=Installatie op de remote host starten -Name[pt]=InstalaÃ§Ã£o remota -GenericName[pt]=Executar instalaÃ§Ã£o no host remoto -Name[sk]=VzdialenÃ¡ inÅ¡talÃ¡cia -GenericName[sk]=SpustiÅ¥ inÅ¡talÃ¡ciu na vzdialenom poÄÃtaÄi -Name[sv]=FjÃ¤rrinstallation -GenericName[sv]=KÃ¶r installation pÃ¥ fjÃ¤rrdator -Name[bg]=ÐÑÐ´Ð°Ð»ÐµÑÐµÐ½Ð¾ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ -GenericName[bg]=Ð¡ÑÐ°ÑÑÐ¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¸Ð½ÑÑÐ°Ð»Ð°ÑÐ¸ÑÑÐ° Ð½Ð° Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½Ð°ÑÐ° Ð¼Ð°ÑÐ¸Ð½Ð° -Name[da]=Fjern installation -GenericName[da]=KÃ¸r Installationen pÃ¥ Fjern-VÃ¦rten -Name[el]=ÎÏÎ¿Î¼Î±ÎºÏÏÏÎ¼ÎÎ½Î· ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· -GenericName[el]=ÎÎºÏÎÎ»ÎµÏÎ· ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï ÏÎµ ÎÏÎ¿Î¼Î±ÎºÏÏÏÎ¼ÎÎ½Î¿ ÎÏÎ¼Î²Î¿ -Name[fr]=Installation Ã distance -GenericName[fr]=ExÃ©cuter l'installation sur l'hÃ´te distant -Name[ja]=ãªã¢ã¼ãã»ã¤ã³ã¹ãã¼ã« -GenericName[ja]=ãªã¢ã¼ãã»ãã¹ãã«ã¤ã³ã¹ãã¼ã«ãå®è¡ãã -Name[sl]=Oddaljena namestitev -GenericName[sl]=PoÅ¾eni namestitev na oddaljenem gostitelju -Name[tr]=Uzaktan kurulum -GenericName[tr]=Uzak makine Ã¼zerinde kurulumu Ã§alÄ±ÅtÄ±r X-KDE-SubstituteUID=true Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=38138&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Fri May 25 11:01:22 2007 @@ -51,11 +51,9 @@ @BUILD@ +# removed explicit adding of translations to group desktop files, since it is covered by the general call (they are in a subdirectory) and it caused build fail + @INSTALL@ -for f in `find $RPM_BUILD_ROOT/usr/share/applications/YaST2/groups/*.desktop` ; do - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done mkdir -p "$RPM_BUILD_ROOT"@clientdir@ mkdir -p "$RPM_BUILD_ROOT"@desktopdir@ -- 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] r38137 - /trunk/autofs/src/helps.ycp
by varkoly＠svn.opensuse.org 24 May '07

24 May '07

Author: varkoly Date: Thu May 24 21:56:20 2007 New Revision: 38137 URL: http://svn.opensuse.org/viewcvs/yast?rev=38137&view=rev Log: fixing bug: 276589 - yast2 - autofs - typo Modified: trunk/autofs/src/helps.ycp Modified: trunk/autofs/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/helps.ycp?rev=38137&r… ============================================================================== --- trunk/autofs/src/helps.ycp (original) +++ trunk/autofs/src/helps.ycp Thu May 24 21:56:20 2007 @@ -88,14 +88,14 @@ /* EntryDialog for NFS entry */ "EntryDialogNFS" : _("<big>NFS Entry</big> In case of NFS entry the Server is the DNS-name or IP-address of the NFS-server. -The Path ist the absolute pfad of the directory on the NFS-server. +The Path is the absolute pfad of the directory on the NFS-server. The Options must be valid options of the mount(8) command for NFS file system. "), /* EntryDialog for SAMBA entry */ "EntryDialogSAMBA" : _("<big>SAMBA Entry</big> In case of SAMBA entry the Server is the DNS-name or IP-address of the SAMBA-server. -The Share ist the name of the share to be mounted. +The Share is the name of the share to be mounted. The Options must be valid options of the mount(8) command for SMB/CIFS file system "), -- 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] r38136 - /tags/stable-2_15_41/packager/
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 17:42:36 2007 New Revision: 38136 URL: http://svn.opensuse.org/viewcvs/yast?rev=38136&view=rev Log: Created tag stable-2_15_41 for packager Added: tags/stable-2_15_41/packager/ - copied from r38135, trunk/packager/ -- 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] r38135 - /tags/stable-2_15_41/
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 17:42:02 2007 New Revision: 38135 URL: http://svn.opensuse.org/viewcvs/yast?rev=38135&view=rev Log: Created tag stable-2_15_41 Added: tags/stable-2_15_41/ -- 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] r38134 - in /trunk/packager: ./ VERSION package/yast2-packager.changes src/ src/clients/ src/config/ src/include/ src/include/checkmedia/ src/include/dirinstall/ src/modules/Packages.ycp
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 17:41:56 2007 New Revision: 38134 URL: http://svn.opensuse.org/viewcvs/yast?rev=38134&view=rev Log: - install 'portmap' package if installing from a NFS source (#277813) - 2.15.41 Modified: trunk/packager/ (props changed) trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/ (props changed) trunk/packager/src/clients/ (props changed) trunk/packager/src/config/ (props changed) trunk/packager/src/include/ (props changed) trunk/packager/src/include/checkmedia/ (props changed) trunk/packager/src/include/dirinstall/ (props changed) trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=38134&r1=38… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu May 24 17:41:56 2007 @@ -1 +1 @@ -2.15.40 +2.15.41 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu May 24 17:41:56 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu May 24 17:27:04 CEST 2007 - lslezak(a)suse.cz + +- install 'portmap' package if installing from a NFS source + (#277813) +- 2.15.41 + +------------------------------------------------------------------- Mon May 21 13:59:38 CEST 2007 - jsrain(a)suse.cz - check if host name specified is valid (#232887) Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Thu May 24 17:41:56 2007 @@ -133,6 +133,7 @@ selected = filter (map<string,any> r, selected, { return r["status"]:nil == `selected; }); + list<string> ret = maplist (map<string,any> r, selected, { string disp = r["summary"]:r["name"]:""; return sformat (format, disp); @@ -552,6 +553,7 @@ */ list<string> sourceAccessPackages() { + // TODO: rather check all registered installation sources... list<string> ret = []; string instmode = Linuxrc::InstallInf("InstMode"); @@ -562,8 +564,13 @@ // /sbin/mount.cifs is required to mount a SMB/CIFS share ret = ["cifs-mount"]; } + else if (instmode == "nfs") + { + // portmap is required to mount an NFS export + ret = ["portmap"]; + } - y2milestone("Packages for access to the installation source: %1", ret); + y2milestone("Packages for accessing the installation source: %1", ret); return ret; } -- 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] r38133 - in /trunk/core: package/yast2-core.changes yast2-core.spec.in
by mvidner＠svn.opensuse.org 24 May '07

24 May '07

Author: mvidner Date: Thu May 24 17:03:44 2007 New Revision: 38133 URL: http://svn.opensuse.org/viewcvs/yast?rev=38133&view=rev Log: add missing %run_ldconfig calls (thanks stbinner) Modified: trunk/core/package/yast2-core.changes trunk/core/yast2-core.spec.in Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Thu May 24 17:03:44 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu May 24 11:56:41 CEST 2007 - stbinner(a)suse.de + +- add missing %run_ldconfig calls + +------------------------------------------------------------------- Thu Apr 19 12:55:05 CEST 2007 - sh(a)suse.de - Merged mod-ui branch changes (r37462:37567) back to trunk: Modified: trunk/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/yast2-core.spec.in?rev=3813… ============================================================================== --- trunk/core/yast2-core.spec.in (original) +++ trunk/core/yast2-core.spec.in Thu May 24 17:03:44 2007 @@ -93,6 +93,12 @@ @CLEAN@ +%post +%run_ldconfig + +%postun +%run_ldconfig + %files %defattr(-,root,root) -- 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] r38132 - /tags/stable-2_15_28/users/
by jsuchome＠svn.opensuse.org 24 May '07

24 May '07

Author: jsuchome Date: Thu May 24 16:13:38 2007 New Revision: 38132 URL: http://svn.opensuse.org/viewcvs/yast?rev=38132&view=rev Log: Created tag stable-2_15_28 for users Added: tags/stable-2_15_28/users/ - copied from r38131, trunk/users/ -- 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] r38131 - in /trunk/users: VERSION package/yast2-users.changes src/Users.pm src/UsersRoutines.pm
by jsuchome＠svn.opensuse.org 24 May '07

24 May '07

Author: jsuchome Date: Thu May 24 16:13:21 2007 New Revision: 38131 URL: http://svn.opensuse.org/viewcvs/yast?rev=38131&view=rev Log: - check for crypted directories modifications before offering 'cryptconfig' installation (#274861) - 2.15.28 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/Users.pm trunk/users/src/UsersRoutines.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=38131&r1=38130… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Thu May 24 16:13:21 2007 @@ -1 +1 @@ -2.15.27 +2.15.28 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Thu May 24 16:13:21 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu May 24 15:58:42 CEST 2007 - jsuchome(a)suse.cz + +- check for crypted directories modifications before offering + 'cryptconfig' installation (#274861) +- 2.15.28 + +------------------------------------------------------------------- Wed May 23 09:55:46 CEST 2007 - jsuchome(a)suse.cz - use LDAPInitWithTLSCheck function for init - offer fallback to Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=38131&r1=… ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Thu May 24 16:13:21 2007 @@ -3324,8 +3324,8 @@ if (!defined $user{$key} || $user{$key} ne $value) { $ret = 1; - y2debug ("old value: $value, changed to: ", - $user{$key} || "-" ); + y2debug ("old value: ", $value || "(not defined)"); + y2debug ("... changed to: ", $user{$key} || "(not defined)" ); } } return $ret; @@ -3367,6 +3367,29 @@ return $ret; } +# take the map of user and check if his crypted directory settings were modified +# return boolean +sub CryptedHomeModified { + + my $self = shift; + my $user = shift; + + my $username = $user->{"uid"} || ""; + my $org_username = $user->{"org_user"}{"uid"} || $username; + my $home = $user->{"homedirectory"} || ""; + my $org_home = $user->{"org_user"}{"homedirectory"} || $home; + my $home_size = $user->{"crypted_home_size"} || 0; + my $org_size = $user->{"org_user"}{"crypted_home_size"} || 0; + my $pw = $user->{"current_text_userpassword"}; + my $new_pw = $user->{"text_userpassword"}; + + return 0 if ($home_size == 0 && $org_size == 0); # nothing to do + return 0 if ($home eq $org_home && $username eq $org_username && $home_size == $org_size && $pw eq $new_pw); + return 0 if !defined $pw; # no change without password provided :-( + return 1; +} + + # Substitute the values of LDAP atributes, predefined in LDAP user configuration BEGIN { $TYPEINFO{SubstituteUserValues} = ["function", "void"] } sub SubstituteUserValues { @@ -4181,7 +4204,7 @@ # only remember for which users we need to call cryptconfig foreach my $username (keys %{$modified_users{"ldap"}}) { my %user = %{$modified_users{"ldap"}{$username}}; - if (defined $user{"crypted_home_size"}) { + if (defined $user{"crypted_home_size"} && $self->CryptedHomeModified (\%user)) { $users_with_crypted_dir{$username} = \%user; } } @@ -4380,7 +4403,7 @@ my $gid = $user{"gidnumber"}; my $create_home = $user{"create_home"}; my $skel = $useradd_defaults{"skel"}; - if (defined $user{"crypted_home_size"}) { + if (defined $user{"crypted_home_size"} && $self->CryptedHomeModified (\%user)) { $users_with_crypted_dir{$username} = \%user; } if ($user_mod eq "imported" || $user_mod eq "added") { Modified: trunk/users/src/UsersRoutines.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersRoutines.pm?rev=3… ============================================================================== --- trunk/users/src/UsersRoutines.pm (original) +++ trunk/users/src/UsersRoutines.pm Thu May 24 16:13:21 2007 @@ -296,10 +296,6 @@ if ($modified eq "added" && !defined $pw) { $pw = $new_pw; } - return 1 if ($home_size == 0 && $org_size == 0); # nothing to do - return 1 if ($home eq $org_home && $username eq $org_username && $home_size == $org_size && $pw eq $new_pw); - return 0 if !defined $pw; # no change without password provided :-( - # now crypt the home directories my $tmpdir = Directory->tmpdir (); -- 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] r38130 - /trunk/packager/src/modules/PackageCallbacks.ycp
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 14:15:45 2007 New Revision: 38130 URL: http://svn.opensuse.org/viewcvs/yast?rev=38130&view=rev Log: - fixed return value in DoneProvide() callback ("CANCEL" -> "C") Modified: trunk/packager/src/modules/PackageCallbacks.ycp Modified: trunk/packager/src/modules/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageCall… ============================================================================== --- trunk/packager/src/modules/PackageCallbacks.ycp (original) +++ trunk/packager/src/modules/PackageCallbacks.ycp Thu May 24 14:15:45 2007 @@ -201,7 +201,7 @@ if (provide_aborted) { provide_aborted = false; - return "CANCEL"; + return "C"; } if (error != 0) -- 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] r38129 - /tags/stable-2_15_10/x11/
by sax2＠svn.opensuse.org 24 May '07

24 May '07

Author: sax2 Date: Thu May 24 13:57:46 2007 New Revision: 38129 URL: http://svn.opensuse.org/viewcvs/yast?rev=38129&view=rev Log: Created tag stable-2_15_10 for x11 Added: tags/stable-2_15_10/x11/ - copied from r38128, trunk/x11/ -- 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] r38128 - in /trunk/x11: VERSION package/yast2-x11.changes src/XLib.pm src/proposal/x11_proposal.ycp
by sax2＠svn.opensuse.org 24 May '07

24 May '07

Author: sax2 Date: Thu May 24 13:53:42 2007 New Revision: 38128 URL: http://svn.opensuse.org/viewcvs/yast?rev=38128&view=rev Log: - 2.15.10 - added grub updater (#277325) Modified: trunk/x11/VERSION trunk/x11/package/yast2-x11.changes trunk/x11/src/XLib.pm trunk/x11/src/proposal/x11_proposal.ycp Modified: trunk/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=38128&r1=38127&r… ============================================================================== --- trunk/x11/VERSION (original) +++ trunk/x11/VERSION Thu May 24 13:53:42 2007 @@ -1 +1 @@ -2.15.9 +2.15.10 Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Thu May 24 13:53:42 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 24 11:46:33 CEST 2007 - ms(a)suse.de + +- 2.15.10 +- added grub updater (#277325) + +------------------------------------------------------------------- Tue May 22 14:40:50 CEST 2007 - ms(a)suse.de - 2.15.9 Modified: trunk/x11/src/XLib.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/XLib.pm?rev=38128&r1=381… ============================================================================== --- trunk/x11/src/XLib.pm (original) +++ trunk/x11/src/XLib.pm Thu May 24 13:53:42 2007 @@ -101,6 +101,21 @@ return $mode; } #========================================== +# setKernelFrameBufferMode +#------------------------------------------ +BEGIN{ $TYPEINFO{setKernelFrameBufferMode} = ["function","boolean","integer"]; } +sub setKernelFrameBufferMode { + my $class = shift; + my $mode = shift; + my $mDesktop = new SaX::SaXManipulateDesktop ( + $section{Desktop},$section{Card},$section{Path} + ); + if (! $mDesktop -> setFBKernelMode ( $mode )) { + return 0; + } + return 1; +} +#========================================== # writeConfiguration #------------------------------------------ BEGIN{ $TYPEINFO{writeConfiguration} = ["function","boolean"]; } Modified: trunk/x11/src/proposal/x11_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/proposal/x11_proposal.yc… ============================================================================== --- trunk/x11/src/proposal/x11_proposal.ycp (original) +++ trunk/x11/src/proposal/x11_proposal.ycp Thu May 24 13:53:42 2007 @@ -357,10 +357,7 @@ integer mode = XLib::getKernelFrameBufferMode(); if (mode > 0) { y2milestone("X11: Updating bootloader to vga=0x%1",mode); - // TODO - // use yast2 bootloader to change vga value - // see Bug: #234142 for details - // --- + XLib::setKernelFrameBufferMode (mode); } } boolean success = XLib::writeConfiguration(); -- 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] r38127 - /trunk/ncurses/src/pkg/.cvsignore
by gs＠svn.opensuse.org 24 May '07

24 May '07

Author: gs Date: Thu May 24 13:46:32 2007 New Revision: 38127 URL: http://svn.opensuse.org/viewcvs/yast?rev=38127&view=rev Log: .cvsignore added Added: trunk/ncurses/src/pkg/.cvsignore Added: trunk/ncurses/src/pkg/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/.cvsignore?rev=3… ============================================================================== --- trunk/ncurses/src/pkg/.cvsignore (added) +++ trunk/ncurses/src/pkg/.cvsignore Thu May 24 13:46:32 2007 @@ -0,0 +1,17 @@ +Makefile +Makefile.in +ncurses +widgetlist +core +bak +*.swp +*.o +*.lo +*.loT +*.la +.deps +.libs +*.kdoc +SETUPENV.sh +gsrc +obsolete -- 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] r38126 - /trunk/ncurses/src/NCFileSelection.cc
by gs＠svn.opensuse.org 24 May '07

24 May '07

Author: gs Date: Thu May 24 12:26:27 2007 New Revision: 38126 URL: http://svn.opensuse.org/viewcvs/yast?rev=38126&view=rev Log: use %lld in sprintf( size_buf, "%lld", fileInfo._size); Modified: trunk/ncurses/src/NCFileSelection.cc Modified: trunk/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCFileSelection.cc?r… ============================================================================== --- trunk/ncurses/src/NCFileSelection.cc (original) +++ trunk/ncurses/src/NCFileSelection.cc Thu May 24 12:26:27 2007 @@ -350,7 +350,7 @@ data.reserve(6); data.push_back( fileInfo._name ); char size_buf[50]; - sprintf( size_buf, "%ld", fileInfo._size); + sprintf( size_buf, "%lld", fileInfo._size); data.push_back( size_buf ); data.push_back( fileInfo._perm ); data.push_back( fileInfo._user ); -- 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] r38125 - /tags/stable-2_15_13/storage/
by fehr＠svn.opensuse.org 24 May '07

24 May '07

Author: fehr Date: Thu May 24 12:23:03 2007 New Revision: 38125 URL: http://svn.opensuse.org/viewcvs/yast?rev=38125&view=rev Log: Created tag stable-2_15_13 for storage Added: tags/stable-2_15_13/storage/ - copied from r38124, trunk/storage/ -- 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] r38124 - in /trunk/storage: package/yast2-storage.changes yast2-storage.spec.in
by fehr＠svn.opensuse.org 24 May '07

24 May '07

Author: fehr Date: Thu May 24 12:22:55 2007 New Revision: 38124 URL: http://svn.opensuse.org/viewcvs/yast?rev=38124&view=rev Log: add evms-devel to needforbuild Modified: trunk/storage/package/yast2-storage.changes trunk/storage/yast2-storage.spec.in Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu May 24 12:22:55 2007 @@ -1,9 +1,14 @@ ------------------------------------------------------------------- +Thu May 24 11:25:44 CEST 2007 - fehr(a)suse.de + +- add evms-devel to needforbuild +- version 2.15.13 + +------------------------------------------------------------------- Mon May 21 12:24:12 CEST 2007 - fehr(a)suse.de - handle very small devices where parted detects number of cylinders as zero (#275959) -- version 2.15.13 ------------------------------------------------------------------- Wed May 16 13:08:06 CEST 2007 - fehr(a)suse.de Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Thu May 24 12:22:55 2007 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: blocxx-devel evms gcc-c++ libxcrypt-devel openssl-devel sablot swig yast2-installation docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite yast2-perl-bindings +BuildRequires: blocxx-devel evms evms-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig yast2-installation docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite yast2-perl-bindings # Required only in inst-sys # Requires: yast2-update Requires: parted yast2-installation yast2-storage-lib yast2-perl-bindings autoyast2-installation -- 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] r38123 - /tags/stable-2_15_7/sound/
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 10:28:03 2007 New Revision: 38123 URL: http://svn.opensuse.org/viewcvs/yast?rev=38123&view=rev Log: Created tag stable-2_15_7 for sound Added: tags/stable-2_15_7/sound/ - copied from r38122, trunk/sound/ -- 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] r38122 - in /trunk/sound: VERSION package/yast2-sound.changes sound/src/joystick.ycp
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 10:27:53 2007 New Revision: 38122 URL: http://svn.opensuse.org/viewcvs/yast?rev=38122&view=rev Log: - added minimal commandline mode support to 'joystick' (#269895) - 2.15.7 Modified: trunk/sound/VERSION trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/joystick.ycp Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=38122&r1=38121… ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Thu May 24 10:27:53 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Thu May 24 10:27:53 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 24 10:26:39 CEST 2007 - lslezak(a)suse.cz + +- added minimal commandline mode support to 'joystick' (#269895) +- 2.15.7 + +------------------------------------------------------------------- Fri Apr 27 12:26:42 CEST 2007 - lslezak(a)suse.cz - translate "iSpeaker" and "Front" channel names (#252595) Modified: trunk/sound/sound/src/joystick.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/joystick.ycp?rev… ============================================================================== --- trunk/sound/sound/src/joystick.ycp (original) +++ trunk/sound/sound/src/joystick.ycp Thu May 24 10:27:53 2007 @@ -28,6 +28,7 @@ import "Sequencer"; import "Sound"; import "Wizard"; + import "CommandLine"; include "sound/joy_dialog.ycp"; include "sound/write_routines.ycp"; @@ -199,57 +200,68 @@ /********************** MAIN ************************/ + symbol StartGUI() + { + // sequence of dialogs + map sequence = $[ + "ws_start" : "detect", + + "detect" : $[ + `next : "save", + `abort : `abort, + `config : "joystick" + ], + + "joystick" : $[ + `abort : `abort, + `next : "detect" + ], + + "save" : $[ + `next : `ws_finish + ] + ]; + + // aliases for dialogs + map aliases = $[ + "detect" : ``(joystick_configuration()), + "joystick" : [ ``(joy_dialog(selected_card, label)), true ], + "save" : ``(saveconfig()) + ]; + + // create wizard dialog + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("joystick"); - // sequence of dialogs - map sequence = $[ - "ws_start" : "detect", - - "detect" : $[ - `next : "save", - `abort : `abort, - `config : "joystick" - ], - - "joystick" : $[ - `abort : `abort, - `next : "detect" - ], - - "save" : $[ - `next : `ws_finish - ] - ]; + // read sound card configuration + boolean progress_orig = Progress::set(false); - // aliases for dialogs - map aliases = $[ - "detect" : ``(joystick_configuration()), - "joystick" : [ ``(joy_dialog(selected_card, label)), true ], - "save" : ``(saveconfig()) - ]; + if (!Sound::Read(false)) + return `abort; - // create wizard dialog - Wizard::CreateDialog(); - Wizard::SetDesktopIcon("joystick"); + Sound::StoreSettings (); - // read sound card configuration - boolean progress_orig = Progress::set(false); + Progress::set(progress_orig); - if (!Sound::Read(false)) - return `abort; + // read joystick configuration + Joystick::Read(abort_block); - Sound::StoreSettings (); + y2debug("Read joystick configuration: %1", Joystick::joystick); - Progress::set(progress_orig); + // start wizard sequencer + Sequencer::Run (aliases, sequence); + + // close dialog + Wizard::CloseDialog(); + } - // read joystick configuration - Joystick::Read(abort_block); - y2debug("Read joystick configuration: %1", Joystick::joystick); - // start wizard sequencer - Sequencer::Run (aliases, sequence); + map cmdline_description = $[ + "id" : "joystick", + "guihandler" : StartGUI, + ]; - // close dialog - Wizard::CloseDialog(); + return CommandLine::Run(cmdline_description); }//EOF -- 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] r38121 - /trunk/packager/src/modules/PackageCallbacks.ycp
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 10:16:28 2007 New Revision: 38121 URL: http://svn.opensuse.org/viewcvs/yast?rev=38121&view=rev Log: - DonePackage: return "I" (ignore) instead of empty string (consistent with DoneProvide) Modified: trunk/packager/src/modules/PackageCallbacks.ycp Modified: trunk/packager/src/modules/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageCall… ============================================================================== --- trunk/packager/src/modules/PackageCallbacks.ycp (original) +++ trunk/packager/src/modules/PackageCallbacks.ycp Thu May 24 10:16:28 2007 @@ -179,7 +179,7 @@ /** during file providal * - // return "" for ignore + // return "I" for ignore // return "R" for retry // return "C" for abort */ @@ -411,7 +411,7 @@ /** * After package install. * - * return "" for ignore + * return "I" for ignore * return "R" for retry * return "C" for abort (not implemented !) */ @@ -464,7 +464,7 @@ } // otherwise return Ignore (default) - return ""; + return "I"; } } else { @@ -514,7 +514,7 @@ // default: ignore } - return ""; + return "I"; } -- 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] r38120 - /tags/stable-2_15_6/tune/
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 09:53:16 2007 New Revision: 38120 URL: http://svn.opensuse.org/viewcvs/yast?rev=38120&view=rev Log: Created tag stable-2_15_6 for tune Added: tags/stable-2_15_6/tune/ - copied from r38119, trunk/tune/ -- 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] r38119 - in /trunk/tune: VERSION hwinfo/src/hwinfo.ycp package/yast2-tune.changes
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 09:53:08 2007 New Revision: 38119 URL: http://svn.opensuse.org/viewcvs/yast?rev=38119&view=rev Log: - added minimal command line mode support to 'hwinfo' (#269892) - 2.15.6 Modified: trunk/tune/VERSION trunk/tune/hwinfo/src/hwinfo.ycp trunk/tune/package/yast2-tune.changes Modified: trunk/tune/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/VERSION?rev=38119&r1=38118&… ============================================================================== --- trunk/tune/VERSION (original) +++ trunk/tune/VERSION Thu May 24 09:53:08 2007 @@ -1 +1 @@ -2.15.5 +2.15.6 Modified: trunk/tune/hwinfo/src/hwinfo.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/hwinfo.ycp?rev=3… ============================================================================== --- trunk/tune/hwinfo/src/hwinfo.ycp (original) +++ trunk/tune/hwinfo/src/hwinfo.ycp Thu May 24 09:53:08 2007 @@ -16,6 +16,7 @@ import "Label"; import "Arch"; import "Directory"; +import "CommandLine"; //include "hwinfo/classnames.ycp"; include "hwinfo/routines.ycp"; @@ -39,26 +40,35 @@ ); } + /* * open progress bar window */ -UI::OpenDialog( - `HBox( - `VSpacing(7), - `VBox( - `HSpacing(40), - `HBox( - `HSquash (`MarginBox (0.5, 0.2, Icon("yast-hwinfo"))), - // translators: popup heading - `Left (`Heading(`id(`heading), _("Probing Hardware..."))) - ), - // progress bar label - `ProgressBar(`id(`initProg), _("Progress"), 1000, 0), - `VSpacing(0.5), - `PushButton(`id(`abort), `opt(`key_F9), Label::AbortButton()) +void OpenProbingPopup() +{ + UI::OpenDialog( + `HBox( + `VSpacing(7), + `VBox( + `HSpacing(40), + `HBox( + `HSquash (`MarginBox (0.5, 0.2, Icon("yast-hwinfo"))), + // translators: popup heading + `Left (`Heading(`id(`heading), _("Probing Hardware..."))) + ), + // progress bar label + `ProgressBar(`id(`initProg), _("Progress"), 1000, 0), + `VSpacing(0.5), + `PushButton(`id(`abort), `opt(`key_F9), Label::AbortButton()) + ) ) - ) -); + ); +} + +void CloseProbingPopup() +{ + UI::CloseDialog(); +} /* * these paths will be excluded from probing. @@ -67,27 +77,30 @@ */ list exclude_list = [.probe.byclass, .probe.bybus, .probe.ihw_data, .probe.system, .probe.status, .probe.cdb_isdn, .probe.boot_disk]; -if (Arch::is_uml()) -{ - // exclude more path in UML system, UML supports/emulates only few devices - exclude_list = union(exclude_list, [ .probe.scsi, .probe.camera, .probe.pppoe, .probe.isapnp, .probe.tape, .probe.joystick, - .probe.usb, .probe.ieee1394ctrl, .probe.usbctrl, .probe.cdrom, .probe.floppy, .probe.chipcard, .probe.mouse - ]); -} -/* - * if xserver is running, don't probe for mouse and chipcard - * because it has bad side effect (moving cursor) - */ -if (SCR::Execute(.target.bash, "/bin/ps -C X") == 0) +void InitProbeList() { - y2warning("X server is running - mouse and chipcard will not be probed"); - exclude_list = add(exclude_list, .probe.mouse); + if (Arch::is_uml()) + { + // exclude more path in UML system, UML supports/emulates only few devices + exclude_list = union(exclude_list, [ .probe.scsi, .probe.camera, .probe.pppoe, .probe.isapnp, .probe.tape, .probe.joystick, + .probe.usb, .probe.ieee1394ctrl, .probe.usbctrl, .probe.cdrom, .probe.floppy, .probe.chipcard, .probe.mouse + ]); + } - // .probe.chipcard has same effect as .probe.mouse - exclude_list = add(exclude_list, .probe.chipcard); -} + /* + * if xserver is running, don't probe for mouse and chipcard + * because it has bad side effect (moving cursor) + */ + if (SCR::Execute(.target.bash, "/bin/ps -C X") == 0) + { + y2warning("X server is running - mouse and chipcard will not be probed"); + exclude_list = add(exclude_list, .probe.mouse); + // .probe.chipcard has same effect as .probe.mouse + exclude_list = add(exclude_list, .probe.chipcard); + } +} /** * Add extra CPU info from .proc.cpuinfo to data read from .probe agent @@ -240,74 +253,84 @@ // Main -// tree item list -term items = nil; -// default initial path -path pat = .probe; -if (size(WFM::Args()) > 0) + +symbol StartGUI() { - // initial path overriden by module argument - pat = topath(WFM::Args(0)); -} + // display progress popup + OpenProbingPopup(); -// build the tree -items = buildHwTree(sformat("%1", pat), 0, 1000); + // set the paths to probe + InitProbeList(); -// interrupted -if (abortPressed) -{ - UI::CloseDialog(); - return `abort; -} + // tree item list + term items = nil; + // default initial path + path pat = .probe; -// title label -string title = _("&All Entries"); //this wasn't marked for translation in 8.0 -if(pat != .probe) -{ - title = trans_str(afterLast(sformat("%1", pat))); -} + // build the tree + items = buildHwTree(sformat("%1", pat), 0, 1000); -UI::CloseDialog(); + // close the popup + CloseProbingPopup(); -term con = `Tree(`id(`idTree), `opt(`vstretch, `hstretch), title, items[1]:nil); + // interrupted + if (abortPressed) + { + return `abort; + } -Wizard::CreateDialog(); -Wizard::SetDesktopIcon("hwinfo"); + // title label + string title = _("&All Entries"); + term con = `Tree(`id(`idTree), `opt(`vstretch, `hstretch), title, items[1]:nil); + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("hwinfo"); -Wizard::SetBackButton(`save, _("&Save to File...") ); -Wizard::SetNextButton(`next, Label::CloseButton() ); -// abort is not needed, module is read-only -Wizard::HideAbortButton(); + Wizard::SetBackButton(`save, _("&Save to File...") ); + Wizard::SetNextButton(`next, Label::CloseButton() ); + // abort is not needed, module is read-only + Wizard::HideAbortButton(); -// dialog header -Wizard::SetContents (_("Hardware Information"), con, -// help text - _("The Hardware Information module displays the hardware -details of your computer. Click any node for more information.\n") -+ _("You can save hardware information to a file. Click Save to File and enter the filename."), -true, true); + // dialog header + Wizard::SetContents (_("Hardware Information"), con, -UI::SetFocus(`id(`idTree)); + // help text + _("The Hardware Information module displays the hardware + details of your computer. Click any node for more information.\n") + + _("You can save hardware information to a file. Click Save to File and enter the filename."), + true, true); -any event = nil; + UI::SetFocus(`id(`idTree)); -// wait for finish -while(event != `abort && event !=`next && event != `cancel) -{ - event = UI::UserInput(); + any event = nil; - if (event == `save) + // wait for finish + while(event != `abort && event !=`next && event != `cancel) { - // store hwinfo output to the file - save_hwinfo_to_file("/"); + event = UI::UserInput(); + + if (event == `save) + { + // store hwinfo output to the file + save_hwinfo_to_file("/"); + } } + Wizard::CloseDialog(); + return `next; } -Wizard::CloseDialog(); -return `next; + +map cmdline_description = $[ + "id" : "hwinfo", + /* Command line help text for the hardware detection module, %1 is "hwinfo" */ + "help" : sformat(_("Hardware Detection - this module doesn't support command line interface, use '%1' instead."), "hwinfo"), + "guihandler": StartGUI, +]; + +return CommandLine::Run(cmdline_description); + /* EOF */ } Modified: trunk/tune/package/yast2-tune.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/package/yast2-tune.changes?… ============================================================================== --- trunk/tune/package/yast2-tune.changes (original) +++ trunk/tune/package/yast2-tune.changes Thu May 24 09:53:08 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 24 09:42:49 CEST 2007 - lslezak(a)suse.cz + +- added minimal command line mode support to 'hwinfo' (#269892) +- 2.15.6 + +------------------------------------------------------------------- Thu Apr 26 09:50:07 CEST 2007 - lslezak(a)suse.cz - disable the IDE DMA module for now - libata doesn't support DMA -- 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] r38118 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: ./ agent-kiwi/
by lslezak＠svn.opensuse.org 24 May '07

24 May '07

Author: lslezak Date: Thu May 24 07:49:39 2007 New Revision: 38118 URL: http://svn.opensuse.org/viewcvs/yast?rev=38118&view=rev Log: - updated svn:ignore property Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/ (props changed) branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ (props changed) -- 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] r38117 - /branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h
by sh-sh-sh＠svn.opensuse.org 23 May '07

23 May '07

Author: sh-sh-sh Date: Wed May 23 17:57:12 2007 New Revision: 38117 URL: http://svn.opensuse.org/viewcvs/yast?rev=38117&view=rev Log: base for widget properties Added: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h Added: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h Wed May 23 17:57:12 2007 @@ -0,0 +1,143 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| | +| (c) SuSE Linux Products GmbH | +\----------------------------------------------------------------------/ + + File: YProperty.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YProperty_h +#define YProperty_h + +#include <string> + +namespace YUI +{ + /** + * Base class for all property classes. Necessary to store different + * template instances in the same container class. + **/ + class YPropertyBase + { + protected: + /** + * Constructor: Create a property with the specified name. + **/ + YPropertyBase( const std::string & name ) + : _name( name ) + {} + + virtual ~YPropertyBase() {} + + public: + /** + * Returns the name of this property. + **/ + std::string name() const { return _name; } + + private: + + std::string _name; + }; + + + /** + * Template class for properties of different types for classes of type + * Widget_T. + **/ + template<class Widget_T, class Value_T> class YProperty: + public YPropertyBase + { + public: + + /** + * Constructor: Create a property with the specified name. + * The value of this property will be retrieved with the specified + * 'getMethod' and set with the specified 'setMethod'. + * + * Example: + * + * class MyWidget: public YWidget + * { + * private: + * std::string _label; + * + * public: + * ... + * std::string label() const { return _label; } + * void setLabel( std::string newLabel ) { _label = newLabel; } + * }; + * + * YProperty<MyWidget, std::string> labelProp( "Label", + * &(MyWidget::label), + * &(MyWidget::setLabel) ); + * MyWidget w = new MyWidget(...); + * std::string myLabel = labelProp.get( w, "Label" ); + **/ + YProperty( const std::string & name, + Value_T (Widget_T::*getMethod)(), + void (Widget_T::*setMethod)( Value_T ) ) + : YPropertyBase( name ) + , _getMethod( getMethod ) + , _setMethodByValue( setMethod ) + , _setMethodByConstRef( 0 ) + {} + + /** + * Constructor with a setMethod that accepts a const ref rather than + * the value directly. + **/ + YProperty( const std::string & name, + Value_T (Widget_T::*getMethod)(), + void (Widget_T::*setMethod)( const Value_T & ) ) + : YPropertyBase( name ) + , _getMethod( getMethod ) + , _setMethodByValue( 0 ) + , _setMethodByConstRef( setMethod ) + {} + + /** + * Destructor. + **/ + virtual ~YProperty() {} + + /** + * Retrieve the current value of this property from 'widget'. + **/ + Value_T get( Widget_T * widget ) const + { + return (widget->*_getMethod)(); + } + + /** + * Set this property in 'widget'. + **/ + void set( Widget_T * widget, Value_T newValue ) + { + if ( _setMethodByValue ) + (widget->*_setMethodByValue)( newValue ); + else + (widget->*_setMethodByConstRef)( newValue ); + } + + private: + Value_T (Widget_T::*_getMethod)(); + void (Widget_T::*_setMethodByValue)( Value_T ); + void (Widget_T::*_setMethodByConstRef)( const Value_T & ); + }; + + +} // namespace YUI + +#endif // YProperty_h -- 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] r38116 - in /trunk/ncurses/src/pkg: NCPackageSelector.cc NCPkgNames.cc NCPkgNames.h
by kmachalkova＠svn.opensuse.org 23 May '07

23 May '07

Author: kmachalkova Date: Wed May 23 17:40:53 2007 New Revision: 38116 URL: http://svn.opensuse.org/viewcvs/yast?rev=38116&view=rev Log: Improved usability of cancel dialog in pkg manager (#274774) Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPkgNames.cc trunk/ncurses/src/pkg/NCPkgNames.h Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Wed May 23 17:40:53 2007 @@ -2221,9 +2221,9 @@ NCPopupInfo cancelMsg( wpos( 2, 2 ), YCPString( NCPkgNames::NotifyLabel() ), YCPString( NCPkgNames::CancelText() ), - NCPkgNames::OKLabel(), - NCPkgNames::CancelLabel() ); - cancelMsg.setNiceSize( 35, 8 ); + NCPkgNames::YesLabel(), + NCPkgNames::NoLabel() ); + cancelMsg.setNiceSize( 45, 8 ); NCursesEvent input = cancelMsg.showInfoPopup( ); if ( input == NCursesEvent::cancel ) { // don't leave the package installation dialog Modified: trunk/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.cc?re… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.cc (original) +++ trunk/ncurses/src/pkg/NCPkgNames.cc Wed May 23 17:40:53 2007 @@ -659,6 +659,13 @@ return value; } +const string NCPkgNames::YesLabel() +{ + // the label of the Yes button + static const string value = _( "&Yes" ); + return value; +} + const string NCPkgNames::AcceptLabel() { // the label of an Accept button @@ -688,6 +695,13 @@ return value; } +const string NCPkgNames::NoLabel() +{ + // the label of the No button + static const string value = _( "&No" ); + return value; +} + const string NCPkgNames::IgnAllLabel() { // the label of the Ingnore all button @@ -1803,7 +1817,7 @@ const string NCPkgNames::CancelText() { // text for a Notify popup - static const string value = _( "All your choices will be lost when exiting with Cancel. Really exit?" ); + static const string value = _( "All changes in package, patch or pattern selection will be lost. Really exit?" ); return value; } Modified: trunk/ncurses/src/pkg/NCPkgNames.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.h?rev… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.h (original) +++ trunk/ncurses/src/pkg/NCPkgNames.h Wed May 23 17:40:53 2007 @@ -547,6 +547,11 @@ */ static const string OKLabel(); + /** + * The label of the Yes button + */ + static const string YesLabel(); + /** * The label of the Accept button */ @@ -556,6 +561,11 @@ * The label of the Cancel button */ static const string CancelLabel(); + + /** + * The label of the No button + */ + static const string NoLabel(); /** * The label of the Cancel/Ignore button -- 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] r38115 - /branches/tmp/dmacvicar/suseras-ruby/
by dmacvicar＠svn.opensuse.org 23 May '07

23 May '07

Author: dmacvicar Date: Wed May 23 17:15:22 2007 New Revision: 38115 URL: http://svn.opensuse.org/viewcvs/yast?rev=38115&view=rev Log: not here Removed: branches/tmp/dmacvicar/suseras-ruby/ -- 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] r38114 - /tags/branch-SLE-10-SP1-2_13_1/product-creator/
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 16:21:13 2007 New Revision: 38114 URL: http://svn.opensuse.org/viewcvs/yast?rev=38114&view=rev Log: Created tag branch-SLE-10-SP1-2_13_1 for product-creator Added: tags/branch-SLE-10-SP1-2_13_1/product-creator/ - copied from r38113, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r38113 - /tags/branch-SLE-10-SP1-2_13_1/product-creator/
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 16:21:00 2007 New Revision: 38113 URL: http://svn.opensuse.org/viewcvs/yast?rev=38113&view=rev Log: - retagging is needed... Removed: tags/branch-SLE-10-SP1-2_13_1/product-creator/ -- 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] r38112 - /branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 16:15:40 2007 New Revision: 38112 URL: http://svn.opensuse.org/viewcvs/yast?rev=38112&view=rev Log: - added missing textdomain in commandline.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp Wed May 23 16:15:40 2007 @@ -11,6 +11,8 @@ import "CommandLine"; import "Progress"; + textdomain "product-creator"; + boolean ListHandler(map params) { foreach(string name, map<string, any> conf, ProductCreator::Configs, -- 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] r38111 - /tags/branch-SLE-10-SP1-2_13_1/product-creator/
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 16:00:13 2007 New Revision: 38111 URL: http://svn.opensuse.org/viewcvs/yast?rev=38111&view=rev Log: Created tag branch-SLE-10-SP1-2_13_1 for product-creator Added: tags/branch-SLE-10-SP1-2_13_1/product-creator/ - copied from r38110, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r38110 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 16:00:04 2007 New Revision: 38110 URL: http://svn.opensuse.org/viewcvs/yast?rev=38110&view=rev Log: - 2.13.1 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Wed May 23 16:00:04 2007 @@ -1 +1 @@ -2.13.0 +2.13.1 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Wed May 23 16:00:04 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed May 23 15:59:07 CEST 2007 - lslezak(a)suse.cz + +- 2.13.1 + +------------------------------------------------------------------- Wed May 23 08:54:36 CEST 2007 - lslezak(a)suse.cz - copy the downloaded packages (moving might fail due to restricted -- 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] r38109 - in /branches/tmp/lslezak: pkg-bindings/ product-creator/
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 15:57:54 2007 New Revision: 38109 URL: http://svn.opensuse.org/viewcvs/yast?rev=38109&view=rev Log: - removed obsolete temporary directories Removed: branches/tmp/lslezak/pkg-bindings/ branches/tmp/lslezak/product-creator/ -- 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] r38108 - /branches/SuSE-SLE-10-SP1-Branch/product-creator/
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 15:55:35 2007 New Revision: 38108 URL: http://svn.opensuse.org/viewcvs/yast?rev=38108&view=rev Log: - added product-creator Added: branches/SuSE-SLE-10-SP1-Branch/product-creator/ - copied from r38092, branches/tmp/lslezak/cd-creator/ -- 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] r38107 - in /branches/tmp/lslezak: cd-creator/ product-creator/ product-creator/agent-kiwi/ product-creator/agents/ product-creator/doc/ product-creator/package/ product-creator/scripts/ product-cr...
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 15:41:00 2007 New Revision: 38107 URL: http://svn.opensuse.org/viewcvs/yast?rev=38107&view=rev Log: - renamed directory 'cd-creator' to 'product-creator' Added: branches/tmp/lslezak/product-creator/ - copied from r38105, branches/tmp/lslezak/cd-creator/ Removed: branches/tmp/lslezak/cd-creator/ branches/tmp/lslezak/product-creator/.cvsignore branches/tmp/lslezak/product-creator/MAINTAINER branches/tmp/lslezak/product-creator/Makefile.cvs branches/tmp/lslezak/product-creator/RPMNAME branches/tmp/lslezak/product-creator/VERSION branches/tmp/lslezak/product-creator/agent-kiwi/ branches/tmp/lslezak/product-creator/agents/ branches/tmp/lslezak/product-creator/configure.in.in branches/tmp/lslezak/product-creator/doc/ branches/tmp/lslezak/product-creator/package/ branches/tmp/lslezak/product-creator/scripts/ branches/tmp/lslezak/product-creator/src/ branches/tmp/lslezak/product-creator/testsuite/ branches/tmp/lslezak/product-creator/yast2-product-creator.spec.in -- 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] r38106 - in /trunk/ncurses/src/pkg: Makefile.am NCPackageSelector.cc NCPackageSelector.h NCPkgPopupFile.cc NCPkgPopupFile.h
by kmachalkova＠svn.opensuse.org 23 May '07

23 May '07

Author: kmachalkova Date: Wed May 23 15:22:08 2007 New Revision: 38106 URL: http://svn.opensuse.org/viewcvs/yast?rev=38106&view=rev Log: Removed obsolete save/load selection stuff + related NCPkgPopupFile class - has been replaced by save/load pkgs and patterns (FaTE #300729) Removed: trunk/ncurses/src/pkg/NCPkgPopupFile.cc trunk/ncurses/src/pkg/NCPkgPopupFile.h Modified: trunk/ncurses/src/pkg/Makefile.am trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPackageSelector.h Modified: trunk/ncurses/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/Makefile.am?rev=… ============================================================================== --- trunk/ncurses/src/pkg/Makefile.am (original) +++ trunk/ncurses/src/pkg/Makefile.am Wed May 23 15:22:08 2007 @@ -27,7 +27,6 @@ NCPkgStatusStrategy.h NCPkgStatusStrategy.cc \ NCPkgPopupDeps.h NCPkgPopupDeps.cc \ NCPkgPopupDiskspace.h NCPkgPopupDiskspace.cc \ - NCPkgPopupFile.h NCPkgPopupFile.cc \ NCPkgPopupDescr.h NCPkgPopupDescr.cc \ NCPkgPopupTable.h NCPkgPopupTable.cc \ NCPkgPopupSearch.h NCPkgPopupSearch.cc \ @@ -40,4 +39,4 @@ INCLUDES = -I$(srcdir)/.. -I$(includedir) -I$(includedir)/yui ${ZYPP_CFLAGS} -EXTRA_DIST = $(ydata_DATA) \ No newline at end of file +EXTRA_DIST = $(ydata_DATA) Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Wed May 23 15:22:08 2007 @@ -31,7 +31,6 @@ #include "NCPkgPopupDiskspace.h" #include "NCPkgPopupTable.h" #include "NCPkgPopupDescr.h" -#include "NCPkgPopupFile.h" #include "NCPackageSelector.h" #include "YSelectionBox.h" #include "YNCursesUI.h" @@ -107,7 +106,6 @@ , languagePopup( 0 ) , diskspacePopup( 0 ) , searchPopup( 0 ) - , filePopup( 0 ) , youMode( false ) , updateMode( false ) , testMode ( false ) @@ -175,8 +173,6 @@ eventHandlerMap[ NCPkgNames::VerifySystem()->toString() ] = &NCPackageSelector::DependencyHandler; eventHandlerMap[ NCPkgNames::ExportToFile()->toString() ] = &NCPackageSelector::FileHandler; eventHandlerMap[ NCPkgNames::ImportFromFile()->toString() ] = &NCPackageSelector::FileHandler; - eventHandlerMap[ NCPkgNames::SaveSel()->toString() ] = &NCPackageSelector::SelectionHandler; - eventHandlerMap[ NCPkgNames::LoadSel()->toString() ] = &NCPackageSelector::SelectionHandler; eventHandlerMap[ NCPkgNames::Testcase()->toString() ] = &NCPackageSelector::TestcaseHandler; // Help menu @@ -226,8 +222,6 @@ // create the filter popup filterPopup = new NCPkgPopupTree( wpos( 1, 1 ), this ); - // the file popup - filePopup = new NCPkgPopupFile( wpos( 1, 1), floppyDevice, this ); } // create the search popup @@ -271,10 +265,6 @@ { delete diskspacePopup; } - if ( filePopup ) - { - delete filePopup; - } if ( searchPopup ) { delete searchPopup; @@ -2218,40 +2208,6 @@ /////////////////////////////////////////////////////////////////// // -// SelectionHandler -// -// Save/Load selections -// -bool NCPackageSelector::SelectionHandler( const NCursesEvent& event ) -{ - NCPkgTable * packageList = getPackageList(); - if ( event.selection.isNull() - || !filePopup ) - { - return false; - } - - if ( event.selection->compare( NCPkgNames::SaveSel() ) == YO_EQUAL ) - { - filePopup->saveToFile(); - } - else if ( event.selection->compare( NCPkgNames::LoadSel() ) == YO_EQUAL ) - { - filePopup->loadFromFile(); - updatePackageList(); - showDiskSpace(); - } - - if ( packageList ) - { - packageList->setKeyboardFocus(); - } - - return true; -} - -/////////////////////////////////////////////////////////////////// -// // CancelHandler // // Cancel button handler. Modified: trunk/ncurses/src/pkg/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.h (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.h Wed May 23 15:22:08 2007 @@ -87,8 +87,6 @@ NCPkgPopupSearch * searchPopup; // the package search popup - NCPkgPopupFile * filePopup; // the save/load selection popup - bool youMode; // YOU bool updateMode; // Update bool testMode; // testing @@ -228,14 +226,7 @@ */ bool DependencyHandler( const NCursesEvent& event ); - /** - * Handler function for menu selection "Etc./Selections" - * @param event The Ncurses event - * @return bool - */ - bool SelectionHandler( const NCursesEvent& event ); - - /** + /** * Handler function for the "Information" menu * @param event The Ncurses event * @return bool -- 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] r38105 - in /trunk/ncurses: package/yast2-ncurses.changes src/pkg/NCPkgPopupDiskspace.cc
by gs＠svn.opensuse.org 23 May '07

23 May '07

Author: gs Date: Wed May 23 14:00:14 2007 New Revision: 38105 URL: http://svn.opensuse.org/viewcvs/yast?rev=38105&view=rev Log: check whether partition size is zero (bug #270836) Modified: trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/pkg/NCPkgPopupDiskspace.cc 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 Wed May 23 14:00:14 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 23 13:54:16 CEST 2007 - gs(a)suse.de + +- Package Installation: check the partition size to prevent + division by zero during disk space calculation (bug #270836) + +------------------------------------------------------------------- Wed May 16 13:15:56 CEST 2007 - gs(a)suse.de - Move all files related to package installation to subdir 'pkg' Modified: trunk/ncurses/src/pkg/NCPkgPopupDiskspace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDisksp… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupDiskspace.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupDiskspace.cc Wed May 23 14:00:14 2007 @@ -236,8 +236,12 @@ { FSize usedSize ( partition.pkg_size, FSize::K ); FSize totalSize ( partition.total_size, FSize::K ); - - int percent = ( 100 * usedSize ) / totalSize; + + int percent = 0; + + if ( totalSize != 0 ) + percent = ( 100 * usedSize ) / totalSize; + int free = ( totalSize - usedSize ) / FSize::MB; NCMIL << "Partition: " << partition.dir << " Used percent: " @@ -293,6 +297,8 @@ // void NCPkgPopupDiskspace::setDiskSpace( wint_t ch ) { + int percent = 0; + // set diskspace values in ZyppDuSet testDiskSpace for ( ZyppDuSetIterator it = testDiskUsage.begin(); it != testDiskUsage.end(); @@ -302,7 +308,9 @@ FSize usedSize ( partitionDu.pkg_size, FSize::K ); FSize totalSize ( partitionDu.total_size, FSize::K ); - int percent = ( 100 * usedSize ) / totalSize; + + if ( totalSize != 0 ) + percent = ( 100 * usedSize ) / totalSize; if ( ch == '+' ) percent += 3; -- 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] r38104 - in /trunk/storage: VERSION libstorage/src/Disk.cc package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 23 May '07

23 May '07

Author: fehr Date: Wed May 23 13:08:25 2007 New Revision: 38104 URL: http://svn.opensuse.org/viewcvs/yast?rev=38104&view=rev Log: - handle very small devices where parted detects number of cylinders as zero (#275959) - version 2.15.13 Modified: trunk/storage/VERSION trunk/storage/libstorage/src/Disk.cc trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=38104&r1=381… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Wed May 23 13:08:25 2007 @@ -1 +1 @@ -2.15.12 +2.15.13 Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Wed May 23 13:08:25 2007 @@ -346,11 +346,16 @@ list<string> geo = splitString( extractNthWord( 0, tmp ), "," ); list<string>::const_iterator i = geo.begin(); unsigned long val = 0; + bool sect_head_changed = false; + bool cyl_changed = false; if( i!=geo.end() ) { *i >> val; if( val>0 ) + { c = val; + cyl_changed = true; + } } ++i; val = 0; @@ -358,7 +363,10 @@ { *i >> val; if( val>0 ) + { h = (unsigned)val; + sect_head_changed = true; + } } ++i; val = 0; @@ -366,7 +374,17 @@ { *i >> val; if( val>0 ) + { s = (unsigned)val; + sect_head_changed = true; + } + } + if( !cyl_changed && sect_head_changed ) + { + c = sizeK()*2/(s*h); + if( c<=0 ) + c=1; + y2mil( "new c:" << c ); } y2milestone( "line:%s", line.c_str() ); y2milestone( "c:%lu h:%u s:%u", c, h, s ); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed May 23 13:08:25 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 21 12:24:12 CEST 2007 - fehr(a)suse.de + +- handle very small devices where parted detects number of cylinders + as zero (#275959) +- version 2.15.13 + +------------------------------------------------------------------- Wed May 16 13:08:06 CEST 2007 - fehr(a)suse.de - add text about not moving progress bar when resizing (#274720) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed May 23 13:08:25 2007 @@ -3329,7 +3329,7 @@ foreach( string dev, map disk, tmp, ``{ disk = getDiskInfo( dev, disk ); - integer s = disk["cyl_count"]:0 * disk["cyl_size"]:0; + integer s = disk["size_k"]:0 * 1024; disk["name"] = disk["dname"]:"" + Partitions::ByteToHumanString( s ) + ", " + disk["device"]:"" + ", "; -- 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] r38103 - /trunk/storage/storage/src/inst_part_proposal.ycp
by fehr＠svn.opensuse.org 23 May '07

23 May '07

Author: fehr Date: Wed May 23 13:03:11 2007 New Revision: 38103 URL: http://svn.opensuse.org/viewcvs/yast?rev=38103&view=rev Log: remove obsolete comment Modified: trunk/storage/storage/src/inst_part_proposal.ycp Modified: trunk/storage/storage/src/inst_part_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_part_pr… ============================================================================== --- trunk/storage/storage/src/inst_part_proposal.ycp (original) +++ trunk/storage/storage/src/inst_part_proposal.ycp Wed May 23 13:03:11 2007 @@ -66,18 +66,6 @@ } - - - // ///////////// DELETE THIS LINE FOR PRODUCTION VERSION - // - // proposal_firsttime = true; - // orig_proposal_firsttime = true; - - - - - - string title = ""; string accept_str = ""; string modify_str = ""; -- 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] r38102 - /branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/
by fehr＠svn.opensuse.org 23 May '07

23 May '07

Author: fehr Date: Wed May 23 12:58:16 2007 New Revision: 38102 URL: http://svn.opensuse.org/viewcvs/yast?rev=38102&view=rev Log: executed propset Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/ (props changed) -- 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] r38101 - /branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore
by fehr＠svn.opensuse.org 23 May '07

23 May '07

Author: fehr Date: Wed May 23 12:55:17 2007 New Revision: 38101 URL: http://svn.opensuse.org/viewcvs/yast?rev=38101&view=rev Log: update .cvsignore Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore Modified: branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/libstorage/doc/autodocs/.cvsignore Wed May 23 12:55:17 2007 @@ -7,3 +7,5 @@ doxygen.log doxygen.conf installdox +tab_?.gif +tabs.css -- 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] r38100 - /tags/branch-SLE-10-SP1-2_13_67/ncurses/
by gs＠svn.opensuse.org 23 May '07

23 May '07

Author: gs Date: Wed May 23 12:03:44 2007 New Revision: 38100 URL: http://svn.opensuse.org/viewcvs/yast?rev=38100&view=rev Log: Created tag branch-SLE-10-SP1-2_13_67 for ncurses Added: tags/branch-SLE-10-SP1-2_13_67/ncurses/ - copied from r38099, branches/SuSE-SLE-10-SP1-Branch/ncurses/ -- 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] r38099 - in /branches/SuSE-SLE-10-SP1-Branch/ncurses: VERSION package/yast2-ncurses.changes src/NCPopupDiskspace.cc
by gs＠svn.opensuse.org 23 May '07

23 May '07

Author: gs Date: Wed May 23 12:03:18 2007 New Revision: 38099 URL: http://svn.opensuse.org/viewcvs/yast?rev=38099&view=rev Log: check whether partition size is zero (bug #270836) Modified: branches/SuSE-SLE-10-SP1-Branch/ncurses/VERSION branches/SuSE-SLE-10-SP1-Branch/ncurses/package/yast2-ncurses.changes branches/SuSE-SLE-10-SP1-Branch/ncurses/src/NCPopupDiskspace.cc Modified: branches/SuSE-SLE-10-SP1-Branch/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ncurses/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/ncurses/VERSION Wed May 23 12:03:18 2007 @@ -1 +1 @@ -2.13.66 +2.13.67 Modified: branches/SuSE-SLE-10-SP1-Branch/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ncurses/package/yast2-ncurses.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/ncurses/package/yast2-ncurses.changes Wed May 23 12:03:18 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 23 11:40:29 CEST 2007 - gs(a)suse.de + +- Package Installation: check the partition size to prevent + division by zero during disk space calculation (bug #270836) +- 2.13.67 + +------------------------------------------------------------------- Tue Mar 6 09:59:22 CET 2007 - kmachalkova(a)suse.cz - initscr() code is back - needed for running yast clients from Modified: branches/SuSE-SLE-10-SP1-Branch/ncurses/src/NCPopupDiskspace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ncurse… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ncurses/src/NCPopupDiskspace.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/ncurses/src/NCPopupDiskspace.cc Wed May 23 12:03:18 2007 @@ -236,8 +236,12 @@ { FSize usedSize ( partition.pkg_size, FSize::K ); FSize totalSize ( partition.total_size, FSize::K ); - - int percent = ( 100 * usedSize ) / totalSize; + + int percent = 0; + + if ( totalSize != 0 ) + percent = ( 100 * usedSize ) / totalSize; + int free = ( totalSize - usedSize ) / FSize::MB; NCMIL << "Partition: " << partition.dir << " Used percent: " @@ -293,6 +297,8 @@ // void NCPopupDiskspace::setDiskSpace( wint_t ch ) { + int percent = 0; + // set diskspace values in ZyppDuSet testDiskSpace for ( ZyppDuSetIterator it = testDiskUsage.begin(); it != testDiskUsage.end(); @@ -302,7 +308,9 @@ FSize usedSize ( partitionDu.pkg_size, FSize::K ); FSize totalSize ( partitionDu.total_size, FSize::K ); - int percent = ( 100 * usedSize ) / totalSize; + + if ( totalSize != 0 ) + percent = ( 100 * usedSize ) / totalSize; if ( ch == '+' ) percent += 3; -- 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] r38098 - /tags/stable-2_15_2/bluetooth/
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 10:55:23 2007 New Revision: 38098 URL: http://svn.opensuse.org/viewcvs/yast?rev=38098&view=rev Log: Created tag stable-2_15_2 for bluetooth Added: tags/stable-2_15_2/bluetooth/ - copied from r38097, trunk/bluetooth/ -- 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] r38097 - in /trunk/bluetooth: VERSION package/yast2-bluetooth.changes src/Bluetooth.ycp
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 10:54:42 2007 New Revision: 38097 URL: http://svn.opensuse.org/viewcvs/yast?rev=38097&view=rev Log: - fix for bluez >= 3.10 (SDP daemon is now included in HCID daemon) (#276650) - 2.15.2 Modified: trunk/bluetooth/VERSION trunk/bluetooth/package/yast2-bluetooth.changes trunk/bluetooth/src/Bluetooth.ycp Modified: trunk/bluetooth/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/VERSION?rev=38097&r1=3… ============================================================================== --- trunk/bluetooth/VERSION (original) +++ trunk/bluetooth/VERSION Wed May 23 10:54:42 2007 @@ -1 +1 @@ -2.15.1 +2.15.2 Modified: trunk/bluetooth/package/yast2-bluetooth.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/package/yast2-bluetoot… ============================================================================== --- trunk/bluetooth/package/yast2-bluetooth.changes (original) +++ trunk/bluetooth/package/yast2-bluetooth.changes Wed May 23 10:54:42 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 23 10:26:31 CEST 2007 - lslezak(a)suse.cz + +- fix for bluez >= 3.10 (SDP daemon is now included in HCID daemon) + (#276650) +- 2.15.2 + +------------------------------------------------------------------- Thu Mar 1 15:08:05 CET 2007 - lslezak(a)suse.cz - fixed a rich text tag in the help text (#249490) Modified: trunk/bluetooth/src/Bluetooth.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bluetooth/src/Bluetooth.ycp?rev=… ============================================================================== --- trunk/bluetooth/src/Bluetooth.ycp (original) +++ trunk/bluetooth/src/Bluetooth.ycp Wed May 23 10:54:42 2007 @@ -106,6 +106,11 @@ if (all != nil && size(all) > 0) { foreach(string var, all, ``{ + // the SDP_START variable might be lying around from < bluez-3.10 + // ignore it. + if (var == "SDP_START") { + continue; + } if (regexpmatch(var, ".*_START$")) { string daemon_name = regexpsub(var, "(.*)_START$", "\\1"); @@ -114,6 +119,8 @@ } ); } + // SDP is always there, but built into hcid since bluez-3.10 + ret = add(ret, "SDP"); return ret; } @@ -154,6 +161,10 @@ // reset daemon list daemons = []; foreach(string service, detected_services, ``{ + if ((service == "SDP" )) + { + continue; + } // read start status boolean service_enabled = (SCR::Read(.sysconfig.bluetooth + (service + "_START")) == "yes"); @@ -163,6 +174,17 @@ // read daemon arguments string args = (string)SCR::Read(.sysconfig.bluetooth + (service + "_DAEMON_ARGS")); + if ((service == "HCI")) + { + boolean sdp_enabled = false; + if (regexpmatch(args, "([ \t]|^)-s([ \t]|$)")) + { + sdp_enabled = true; + } + daemons = add(daemons, $[ "service" : "SDP", "enabled": sdp_enabled, + "daemon" : "", "args" : "" ]); + } + daemons = add(daemons, $[ "service" : service, "enabled" : service_enabled, "daemon" : binary, "args" : args ]); } @@ -259,7 +281,31 @@ SCR::Write(.sysconfig.bluetooth.START_SERVICES, (enabled) ? "yes" : "no"); // write daemon settings + boolean sdp_enabled = false; foreach(map<string,any> d, daemons, ``{ + if ((d["service"]:"") == "SDP") + { + sdp_enabled = (d["enabled"]:false); + } + } + ); + foreach(map<string,any> d, daemons, ``{ + if ((d["service"]:"") == "SDP") + { + // SDPD is now handled by passing "-s" to hcid, since bluez-3.10 + continue; + } + else if ((d["service"]:"") == "HCI") + { + if (regexpmatch(d["args"]:"", "([ \t]|^)-s([ \t]|$)")) + { + d["args"] = regexpsub(d["args"]:"", "(.*)([ \t]|^)-s([ \t]|$)(.*)", "\\1 \\4"); + } + if (sdp_enabled) + { + d["args"] = "-s " + (d["args"]:""); + } + } SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_START"), d["enabled"]:false ? "yes" : "no"); SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_DAEMON_ARGS"), d["args"]:""); } -- 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] r38096 - /tags/stable-2_15_27/users/
by jsuchome＠svn.opensuse.org 23 May '07

23 May '07

Author: jsuchome Date: Wed May 23 10:06:47 2007 New Revision: 38096 URL: http://svn.opensuse.org/viewcvs/yast?rev=38096&view=rev Log: Created tag stable-2_15_27 for users Added: tags/stable-2_15_27/users/ - copied from r38095, trunk/users/ -- 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] r38095 - /tags/stable-2_15_8/ldap-client/
by jsuchome＠svn.opensuse.org 23 May '07

23 May '07

Author: jsuchome Date: Wed May 23 10:06:36 2007 New Revision: 38095 URL: http://svn.opensuse.org/viewcvs/yast?rev=38095&view=rev Log: Created tag stable-2_15_8 for ldap-client Added: tags/stable-2_15_8/ldap-client/ - copied from r38094, trunk/ldap-client/ -- 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] r38094 - in /trunk/users: VERSION package/yast2-users.changes src/UsersLDAP.pm yast2-users.spec.in
by jsuchome＠svn.opensuse.org 23 May '07

23 May '07

Author: jsuchome Date: Wed May 23 10:06:34 2007 New Revision: 38094 URL: http://svn.opensuse.org/viewcvs/yast?rev=38094&view=rev Log: - use LDAPInitWithTLSCheck function for init - offer fallback to unencrypted connection (#246397) - 2.15.27 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersLDAP.pm trunk/users/yast2-users.spec.in Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=38094&r1=38093… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Wed May 23 10:06:34 2007 @@ -1 +1 @@ -2.15.26 +2.15.27 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Wed May 23 10:06:34 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed May 23 09:55:46 CEST 2007 - jsuchome(a)suse.cz + +- use LDAPInitWithTLSCheck function for init - offer fallback to + unencrypted connection (#246397) +- 2.15.27 + +------------------------------------------------------------------- Fri May 11 13:23:21 CEST 2007 - jsuchome(a)suse.cz - during autoinstallation, do not touch already created directories Modified: trunk/users/src/UsersLDAP.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersLDAP.pm?rev=38094… ============================================================================== --- trunk/users/src/UsersLDAP.pm (original) +++ trunk/users/src/UsersLDAP.pm Wed May 23 10:06:34 2007 @@ -206,7 +206,7 @@ } Ldap->SetGUI ($use_gui); - my $ldap_mesg = Ldap->LDAPInit (); + my $ldap_mesg = Ldap->LDAPInitWithTLSCheck ({}); if ($ldap_mesg ne "") { Ldap->LDAPErrorMessage ("init", $ldap_mesg); return $ldap_mesg; Modified: trunk/users/yast2-users.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/yast2-users.spec.in?rev=38… ============================================================================== --- trunk/users/yast2-users.spec.in (original) +++ trunk/users/yast2-users.spec.in Wed May 23 10:06:34 2007 @@ -3,11 +3,13 @@ @HEADER@ BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite yast2-core-devel -Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext yast2-ldap-client +Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext Obsoletes: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user Provides: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user -#BuildArchitectures: noarch +# LDAPInitWithTLSCheck +Requires: yast2-ldap-client >= 2.15.8 + Summary: Configuration of users -- 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] r38093 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp src/LdapPopup.ycp src/ldap_browser.ycp
by jsuchome＠svn.opensuse.org 23 May '07

23 May '07

Author: jsuchome Date: Wed May 23 10:06:23 2007 New Revision: 38093 URL: http://svn.opensuse.org/viewcvs/yast?rev=38093&view=rev Log: - added LDAPInitWithTLSCheck function to offer fallback to uncrypted connection when start_tls method failed (#246397) - save changed settings even if PAM is not set (#248181) - 2.15.8 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/LdapPopup.ycp trunk/ldap-client/src/ldap_browser.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=38093&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed May 23 10:06:23 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed May 23 10:06:23 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed May 23 09:50:50 CEST 2007 - jsuchome(a)suse.cz + +- added LDAPInitWithTLSCheck function to offer fallback to uncrypted + connection when start_tls method failed (#246397) +- save changed settings even if PAM is not set (#248181) +- 2.15.8 + +------------------------------------------------------------------- Thu May 3 13:58:40 CEST 2007 - jsuchome(a)suse.cz - support minimal command line for ldap_browser (#269897) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=380… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed May 23 10:06:23 2007 @@ -883,6 +883,103 @@ } /** + * popup shown after failed connection: ask for retry withou TLS (see bug 246397) + * @return true if user wants to retry without TLS + */ + global define boolean ConnectWithoutTLS (map errmap) { + + UI::OpenDialog (`HBox(`HSpacing (0.5), + `VBox( + `VSpacing (0.5), + // label + `Left (`Heading (Label::ErrorMsg())), + // error message + `Left (`Label (_("Connection to the LDAP server cannot be established."))), + `ReplacePoint (`id(`rp), `Empty()), + `VSpacing (0.2), + `Left (`CheckBox (`id(`details), `opt (`notify), + // checkbox label + _("&Show Details"), false)), + `VSpacing (), + `Left (`Label ( + // question following error message (yes/no buttons follow) +_("A possible cause of the failed connection may be that your client is +configured for TLS/SSL but the server does not support it. + +Retry connection without TLS/SSL?"))), + `HBox ( + `PushButton (`id(`yes), `opt(`key_F10,`default), Label::YesButton()), + `PushButton (`id(`no),`opt(`key_F9), Label::NoButton()) + ) + ), + `HSpacing(0.5)) + ); + any ret = nil; + do + { + ret = UI::UserInput(); + if (ret == `details) + { + if ((boolean)UI::QueryWidget (`id(`details), `Value)) + UI::ReplaceWidget (`id(`rp), `VBox ( + `Label (errmap["msg"]:""))); + else + UI::ReplaceWidget (`id(`rp), `Empty()); + } + } + while (ret != `yes && ret != `no); + UI::CloseDialog (); + return ret == `yes; + } + + /** + * Initializes LDAP agent, offers to turn off TLS if it failed + * @args arguments to use for initializaton (if empty, uses the current values) + */ + global define string LDAPInitWithTLSCheck (map args) { + + string ret = ""; + if (args == $[]) + args = $[ + "hostname" : GetFirstServer (server), + "port" : GetFirstPort (server), + "version" : ldap_v2 ? 2 : 3, + "use_tls" : ldap_tls ? "yes" : "no" + ]; + boolean init = (boolean) SCR::Execute (.ldap, args); + // error message + string unknown = _("Unknown error. Perhaps 'yast2-ldap' is not available."); + if (init == nil) + { + ret = unknown; + } + else + { + if (!init) + { + map errmap = Ldap::LDAPErrorMap (); + if (ldap_tls && errmap["tls_error"]:false && ConnectWithoutTLS (errmap)) + { + args["use_tls"] = false; + init = (boolean) SCR::Execute (.ldap, args); + if (init == nil) + ret = unknown; + else if (!init) + ret = LDAPError(); + } + else + { + ret = errmap["msg"]:""; + if (errmap["server_msg"]:"" != "") + ret = sformat ("%1\n%2", ret, errmap["server_msg"]:""); + } + } + ldap_initialized = init; + } + return ret; + } + + /** * Binds to LDAP server * @param pass password */ @@ -2128,21 +2225,6 @@ WriteLdapConfEntry ("ssl", "no"); Pam::Set ("mkhomedir", mkhomedir); - } - if (start) // ldap used for authentocation - { - // ---------- correct pam_password value for Novell eDirectory - if (pam_password != "nds" && expert_ui) - { - if (!nds_checked && !Mode::autoinst ()) - { - CheckNDS (); - } - if (nds) - { - pam_password = "nds"; - } - } WriteLdapConfEntry ("pam_password", pam_password); @@ -2162,6 +2244,22 @@ (nss_base_shadow != "")? nss_base_shadow : user_base); WriteLdapConfEntry ("nss_base_group", (nss_base_group != "")? nss_base_group : user_base); + } + if (start) // ldap used for authentocation + { + // ---------- correct pam_password value for Novell eDirectory + if (pam_password != "nds" && expert_ui) + { + if (!nds_checked && !Mode::autoinst ()) + { + CheckNDS (); + } + if (nds) + { + pam_password = "nds"; + } + WriteLdapConfEntry ("pam_password", pam_password); + } // override LDAPNOINIT (#217701) WriteLdapConfEntry ("tls_checkpeer", "no"); Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?re… ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Wed May 23 10:06:23 2007 @@ -187,10 +187,10 @@ "version" : Ldap::ldap_v2 ? 2 : 3, "use_tls" : Ldap::ldap_tls ? "yes" : "no" ]; - boolean init = (boolean) SCR::Execute (.ldap, args); - if (init == nil || !init) + string error = Ldap::LDAPInitWithTLSCheck (args); + if (error != "") { - Ldap::LDAPErrorMessage ("init", Ldap::LDAPError ()); + Ldap::LDAPErrorMessage ("init", error); return root_dn; } return BrowseTree (root_dn); Modified: trunk/ldap-client/src/ldap_browser.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ldap_browser.ycp… ============================================================================== --- trunk/ldap-client/src/ldap_browser.ycp (original) +++ trunk/ldap-client/src/ldap_browser.ycp Wed May 23 10:06:23 2007 @@ -89,55 +89,6 @@ return size (tmp_data) > 0; } - /** - * popup shown after failed connection: ask for retry withou TLS (see bug 246397) - * @return true if user wants to retry without TLS - */ - define boolean connect_without_tls (map errmap) { - - UI::OpenDialog (`HBox(`HSpacing (0.5), - `VBox( - `VSpacing (0.5), - // label - `Left (`Heading (Label::ErrorMsg())), - // error message - `Left (`Label (_("Connection to the LDAP server cannot be established."))), - `ReplacePoint (`id(`rp), `Empty()), - `VSpacing (0.2), - `Left (`CheckBox (`id(`details), `opt (`notify), - // checkbox label - _("&Show Details"), false)), - `VSpacing (), - `Left (`Label ( - // question following error message (yes/no buttons follow) -_("A possible cause of the failed connection may be that your client is -configured for TLS/SSL but the server does not support it. - -Retry connection without TLS/SSL?"))), - `HBox ( - `PushButton (`id(`yes), `opt(`key_F10,`default), Label::YesButton()), - `PushButton (`id(`no),`opt(`key_F9), Label::NoButton()) - ) - ), - `HSpacing(0.5)) - ); - any ret = nil; - do - { - ret = UI::UserInput(); - if (ret == `details) - { - if ((boolean)UI::QueryWidget (`id(`details), `Value)) - UI::ReplaceWidget (`id(`rp), `VBox ( - `Label (errmap["msg"]:""))); - else - UI::ReplaceWidget (`id(`rp), `Empty()); - } - } - while (ret != `yes && ret != `no); - UI::CloseDialog (); - return ret == `yes; - } // helper: create the value that should be shown instead of whole DN in tree define string show_dn (string dn) { @@ -367,31 +318,11 @@ Ldap::bind_pass = (string) UI::QueryWidget(`id(`pw), `Value); Ldap::SetAnonymous (ret == `anon); - string error = ""; - map args = $[ - "hostname" : Ldap::GetFirstServer (Ldap::server), - "port" : Ldap::GetFirstPort (Ldap::server), - "version" : Ldap::ldap_v2 ? 2 : 3, - "use_tls" : Ldap::ldap_tls ? "yes" : "no" - ]; - if (SCR::Execute (.ldap, args) != true) + string error = Ldap::LDAPInitWithTLSCheck ($[]); + if (error != "") { - map errmap = Ldap::LDAPErrorMap (); - if (Ldap::ldap_tls && errmap["tls_error"]:false && connect_without_tls (errmap)) - { - Ldap::ldap_tls = false; - error = Ldap::LDAPInit (); - if (error != "") - { - Ldap::LDAPErrorMessage ("init", error); - continue; - } - } - else - { - Ldap::LDAPErrorMessage ("init", errmap["msg"]:""); - continue; - } + Ldap::LDAPErrorMessage ("init", error); + continue; } error = Ldap::LDAPBind (Ldap::bind_pass); -- 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] r38092 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 23 May '07

23 May '07

Author: lslezak Date: Wed May 23 09:15:17 2007 New Revision: 38092 URL: http://svn.opensuse.org/viewcvs/yast?rev=38092&view=rev Log: - copy the downloaded packages (moving might fail due to restricted permissions) - use cd:/// URL scheme in add_on_products file to automatically add the addons during installation Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Wed May 23 09:15:17 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed May 23 08:54:36 CEST 2007 - lslezak(a)suse.cz + +- copy the downloaded packages (moving might fail due to restricted + permissions) +- use cd:/// URL scheme in add_on_products file to automatically + add the addons during installation + +------------------------------------------------------------------- Tue May 22 16:49:28 CEST 2007 - lslezak(a)suse.cz - run the package selector when there is an unresolved dependency Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/Pr… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Wed May 23 09:15:17 2007 @@ -997,7 +997,7 @@ ret = ret + "\n"; } - ret = ret + subdir; + ret = ret + "cd:///" + subdir; } } ); @@ -2100,7 +2100,7 @@ break; } - string cpCmd = sformat("mv %1 %2", l_packge, dir ); + string cpCmd = sformat("cp -a %1 %2", l_packge, dir ); y2debug("%1", cpCmd); -- 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] r38091 - /trunk/autoinstallation/src/dialogs/general_dialogs.ycp
by ug＠svn.opensuse.org 22 May '07

22 May '07

Author: ug Date: Tue May 22 17:10:10 2007 New Revision: 38091 URL: http://svn.opensuse.org/viewcvs/yast?rev=38091&view=rev Log: typo fixed Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/gen… ============================================================================== --- trunk/autoinstallation/src/dialogs/general_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/general_dialogs.ycp Tue May 22 17:10:10 2007 @@ -206,7 +206,7 @@ "stage":stage, "dialog":dialog, "element":defaultValues["element"]:max, - "script":defaultValues["script"]:"", + "script":defaultValues["script"]:$[], "question":(string)UI::QueryWidget(`id(`question), `Value) ]; if( (string)UI::QueryWidget(`id(`frametitle), `Value) != "" ) newVal["frametitle"] = (string)UI::QueryWidget(`id(`frametitle), `Value); -- 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] r38090 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/ProductCreator.ycp src/complex.ycp
by lslezak＠svn.opensuse.org 22 May '07

22 May '07

Author: lslezak Date: Tue May 22 16:51:52 2007 New Revision: 38090 URL: http://svn.opensuse.org/viewcvs/yast?rev=38090&view=rev Log: - run the package selector when there is an unresolved dependency when creating installation ISO Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp branches/tmp/lslezak/cd-creator/src/complex.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Tue May 22 16:51:52 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 16:49:28 CEST 2007 - lslezak(a)suse.cz + +- run the package selector when there is an unresolved dependency + when creating installation ISO + +------------------------------------------------------------------- Tue May 22 14:05:39 CEST 2007 - lslezak(a)suse.cz - escape XML entities in URL when writing the config file Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/Pr… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Tue May 22 16:51:52 2007 @@ -1970,7 +1970,7 @@ Progress::Title(_("Checking for package availability...")); list<string> selectedPackages = Pkg::GetPackages (`selected , true); - y2milestone("Selected %1 packages", size(selectedPackages)); + y2milestone("Selected %1 packages: %2", size(selectedPackages), sort(selectedPackages)); list<string> failed = []; toCopy = $[]; Modified: branches/tmp/lslezak/cd-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/co… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/complex.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/complex.ycp Tue May 22 16:51:52 2007 @@ -24,7 +24,7 @@ import "CommandLine"; include "product-creator/helps.ycp"; - //include "product-creator/routines.ycp"; + include "product-creator/dialogs.ycp"; /** * Return a modification status @@ -464,6 +464,15 @@ CommandLine::PrintVerbose(_("Selecting packages...")); success = ProductCreator::setPackages(); + if (!success) + { + // set a fake root mount point - there is no use to display DU of the current system + Pkg::TargetInitDU([ $[ "name" : "/", "free" : 999*1024*1024 /* 999GB */, "used" : 0, "readonly" : false ] ]); + + // the solver has failed, let the user resolve the dependencies + detailedSelection(nil); + } + Progress::NextStage(); CommandLine::PrintVerbose(_("Checking packages...")); -- 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] r38089 - /trunk/autoinstallation/src/dialogs/general_dialogs.ycp
by ug＠svn.opensuse.org 22 May '07

22 May '07

Author: ug Date: Tue May 22 16:29:37 2007 New Revision: 38089 URL: http://svn.opensuse.org/viewcvs/yast?rev=38089&view=rev Log: ask-UI enhancements Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/gen… ============================================================================== --- trunk/autoinstallation/src/dialogs/general_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/general_dialogs.ycp Tue May 22 16:29:37 2007 @@ -155,8 +155,8 @@ ) ), `HBox( - `TextEntry( `id(`selLabel), "Label", "" ), - `TextEntry( `id(`selValue), _("Value"), "" ), + `TextEntry( `id(`selLabel), `opt(`notify,`immediate), "Label", "" ), + `TextEntry( `id(`selValue), `opt(`notify,`immediate), _("Value"), "" ), `PushButton( `id( `addSelection ), `opt( `default, `hstretch ), _("Add") ) ), `HBox( @@ -168,6 +168,17 @@ string help_text = _(""); UI::OpenDialog( `opt(`decorated ), contents ); repeat { + if( size( (list)UI::QueryWidget(`id(`selection), `Items) ) == 0 ) { + UI::ChangeWidget(`id(`delSelection) , `Enabled, false); + } else { + UI::ChangeWidget(`id(`delSelection) , `Enabled, true); + } + if( size( (string)UI::QueryWidget(`id(`selLabel), `Value) ) == 0 || + size( (string)UI::QueryWidget(`id(`selValue), `Value) ) == 0 ) { + UI::ChangeWidget(`id(`addSelection) , `Enabled, false); + } else { + UI::ChangeWidget(`id(`addSelection) , `Enabled, true); + } ret = (symbol)UI::UserInput(); if( ret == `addSelection ) { string label = (string)UI::QueryWidget(`id(`selLabel), `Value); @@ -194,7 +205,8 @@ "title":title, "stage":stage, "dialog":dialog, - "element":defaultValues["element"]:max, + "element":defaultValues["element"]:max, + "script":defaultValues["script"]:"", "question":(string)UI::QueryWidget(`id(`question), `Value) ]; if( (string)UI::QueryWidget(`id(`frametitle), `Value) != "" ) newVal["frametitle"] = (string)UI::QueryWidget(`id(`frametitle), `Value); -- 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] r38088 - /tags/branch-SLE-10-SP1-2_13_14/x11/
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 14:51:13 2007 New Revision: 38088 URL: http://svn.opensuse.org/viewcvs/yast?rev=38088&view=rev Log: Created tag branch-SLE-10-SP1-2_13_14 for x11 Added: tags/branch-SLE-10-SP1-2_13_14/x11/ - copied from r38087, branches/SuSE-SLE-10-SP1-Branch/x11/ -- 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] r38087 - in /branches/SuSE-SLE-10-SP1-Branch/x11: VERSION package/yast2-x11.changes src/XLib.pm
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 14:50:56 2007 New Revision: 38087 URL: http://svn.opensuse.org/viewcvs/yast?rev=38087&view=rev Log: - 2.13.14 - fixed x11 setup on Xen para-virtualized framebuffer (#267220) Modified: branches/SuSE-SLE-10-SP1-Branch/x11/VERSION branches/SuSE-SLE-10-SP1-Branch/x11/package/yast2-x11.changes branches/SuSE-SLE-10-SP1-Branch/x11/src/XLib.pm Modified: branches/SuSE-SLE-10-SP1-Branch/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/x11/VE… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/x11/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/x11/VERSION Tue May 22 14:50:56 2007 @@ -1 +1 @@ -2.13.13 +2.13.14 Modified: branches/SuSE-SLE-10-SP1-Branch/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/x11/pa… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/x11/package/yast2-x11.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/x11/package/yast2-x11.changes Tue May 22 14:50:56 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 14:40:50 CEST 2007 - ms(a)suse.de + +- 2.13.14 +- fixed x11 setup on Xen para-virtualized framebuffer (#267220) + +------------------------------------------------------------------- Wed May 9 12:13:22 CEST 2007 - ms(a)suse.de - v2.13.13 Modified: branches/SuSE-SLE-10-SP1-Branch/x11/src/XLib.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/x11/sr… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/x11/src/XLib.pm (original) +++ branches/SuSE-SLE-10-SP1-Branch/x11/src/XLib.pm Tue May 22 14:50:56 2007 @@ -465,6 +465,9 @@ $color = GetFbColor(); } my @list = @{$mDesktop->getResolutions($color)}; + if (! @list) { + push (@list,"800x600"); + } my $result = shift (@list); return $result; } -- 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] r38086 - /trunk/network/src/modules/Proxy.ycp
by kmachalkova＠svn.opensuse.org 22 May '07

22 May '07

Author: kmachalkova Date: Tue May 22 14:45:35 2007 New Revision: 38086 URL: http://svn.opensuse.org/viewcvs/yast?rev=38086&view=rev Log: again and better Modified: trunk/network/src/modules/Proxy.ycp Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?re… ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Tue May 22 14:45:35 2007 @@ -231,7 +231,7 @@ // timeout for the connection integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL - string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url '%4'"; + string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url %4"; string http_command = sformat(command, http_proxy, user_pass, timeout_sec, "http://www.novell.com"); // adding option --insecure to accept the certificate without asking string https_command = sformat(command, https_proxy, user_pass, timeout_sec, "https://secure-www.novell.com --insecure"); -- 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] r38085 - /tags/stable-2_15_9/x11/
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 14:43:07 2007 New Revision: 38085 URL: http://svn.opensuse.org/viewcvs/yast?rev=38085&view=rev Log: Created tag stable-2_15_9 for x11 Added: tags/stable-2_15_9/x11/ - copied from r38084, trunk/x11/ -- 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] r38084 - in /trunk/x11: VERSION package/yast2-x11.changes src/XLib.pm
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 14:42:14 2007 New Revision: 38084 URL: http://svn.opensuse.org/viewcvs/yast?rev=38084&view=rev Log: - 2.15.9 - fixed x11 setup on Xen para-virtualized framebuffer (#267220) Modified: trunk/x11/VERSION trunk/x11/package/yast2-x11.changes trunk/x11/src/XLib.pm Modified: trunk/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=38084&r1=38083&r… ============================================================================== --- trunk/x11/VERSION (original) +++ trunk/x11/VERSION Tue May 22 14:42:14 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Tue May 22 14:42:14 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 14:40:50 CEST 2007 - ms(a)suse.de + +- 2.15.9 +- fixed x11 setup on Xen para-virtualized framebuffer (#267220) + +------------------------------------------------------------------- Tue May 22 11:25:41 CEST 2007 - ms(a)suse.de - 2.15.8 Modified: trunk/x11/src/XLib.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/XLib.pm?rev=38084&r1=380… ============================================================================== --- trunk/x11/src/XLib.pm (original) +++ trunk/x11/src/XLib.pm Tue May 22 14:42:14 2007 @@ -501,6 +501,9 @@ $color = GetFbColor(); } my @list = @{$mDesktop->getResolutions($color)}; + if (! @list) { + push (@list,"800x600"); + } my $result = shift (@list); return $result; } -- 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] r38083 - /tags/stable-2_15_33/network/
by kmachalkova＠svn.opensuse.org 22 May '07

22 May '07

Author: kmachalkova Date: Tue May 22 14:32:02 2007 New Revision: 38083 URL: http://svn.opensuse.org/viewcvs/yast?rev=38083&view=rev Log: Created tag stable-2_15_33 for network Added: tags/stable-2_15_33/network/ - copied from r38082, trunk/network/ -- 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] r38082 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Proxy.ycp
by kmachalkova＠svn.opensuse.org 22 May '07

22 May '07

Author: kmachalkova Date: Tue May 22 14:29:55 2007 New Revision: 38082 URL: http://svn.opensuse.org/viewcvs/yast?rev=38082&view=rev Log: - Escape backslash characters in proxy auth credentials properly (#256360) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Proxy.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38082&r1=380… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue May 22 14:29:55 2007 @@ -1 +1 @@ -2.15.32 +2.15.33 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue May 22 14:29:55 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue May 22 13:59:04 CEST 2007 - kmachalkova(a)suse.cz + +- Escape backslash characters in proxy auth credentials properly + (#256360) +- 2.15.33 + +------------------------------------------------------------------- Mon May 21 13:57:47 CEST 2007 - kmachalkova(a)suse.cz - IsHostLocal test extended to include also hostname and/or IP set by Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?re… ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Tue May 22 14:29:55 2007 @@ -110,7 +110,7 @@ ]; string caption = _("Saving Proxy Configuration"); - integer sl = 100; //sleep for longer time, so that progress does not disappear right afterwards + integer sl = 500; //sleep for longer time, so that progress does not disappear right afterwards Progress::New(caption, " ", size(steps), steps, [], ""); @@ -215,11 +215,14 @@ https_proxy = mergestring (splitstring(https_proxy, "\""), "\\\""); ftp_proxy = mergestring (splitstring(ftp_proxy, "\""), "\\\""); proxy_user = mergestring (splitstring(proxy_user, "\""), "\\\""); + //escape also '\' character - usernames such as domain\user are causing pain to .target.bash_output + //and to curl - #256360 + proxy_user = mergestring (splitstring(proxy_user, "\\"), "\\\\"); proxy_password = mergestring (splitstring(proxy_password, "\""), "\\\""); string user_pass = (proxy_user != "" ? - " --proxy-user " + "'" + proxy_user + "'" + (proxy_password != "" ? - ":" + "'" + proxy_password + "'" + " --proxy-user " + proxy_user + (proxy_password != "" ? + ":" + proxy_password : "") : @@ -228,7 +231,7 @@ // timeout for the connection integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL - string command = "curl --verbose --proxy '%1' %2 --connect-timeout %3 --url '%4'"; + string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url '%4'"; string http_command = sformat(command, http_proxy, user_pass, timeout_sec, "http://www.novell.com"); // adding option --insecure to accept the certificate without asking string https_command = sformat(command, https_proxy, user_pass, timeout_sec, "https://secure-www.novell.com --insecure"); -- 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] r38081 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 22 May '07

22 May '07

Author: lslezak Date: Tue May 22 14:07:19 2007 New Revision: 38081 URL: http://svn.opensuse.org/viewcvs/yast?rev=38081&view=rev Log: - escape XML entities in URL when writing the config file (fixed saving of ISO file URL) Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Tue May 22 14:07:19 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 14:05:39 CEST 2007 - lslezak(a)suse.cz + +- escape XML entities in URL when writing the config file + (fixed saving of ISO file URL) + +------------------------------------------------------------------- Mon May 21 16:58:32 CEST 2007 - lslezak(a)suse.cz - fixed the default boot item in isolinux.cfg for AutoYast Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/Pr… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Tue May 22 14:07:19 2007 @@ -377,6 +377,24 @@ global define list PrepareConfigs() ``{ list c = maplist(string k, map v, Configs, ``{ + + list<string> sources = v["sources"]:[]; + + // escape XML entities in URL + // (e.g. iso:///?iso=image.iso&url=file:///local/images/ cannot be stored by the XML agent) + if (size(sources) > 0) + { + sources = maplist(string src, sources, + { + return String::EscapeTags(src); + } + ); + + y2internal("Escaped sources: %1", sources); + + v["sources"] = sources; + } + return(v); }); return (c); -- 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] r38080 - /tags/stable-2_15_8/x11/
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 13:53:45 2007 New Revision: 38080 URL: http://svn.opensuse.org/viewcvs/yast?rev=38080&view=rev Log: Created tag stable-2_15_8 for x11 Added: tags/stable-2_15_8/x11/ - copied from r38079, trunk/x11/ -- 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] r38079 - in /trunk/x11: VERSION package/yast2-x11.changes src/proposal/x11_proposal.ycp
by sax2＠svn.opensuse.org 22 May '07

22 May '07

Author: sax2 Date: Tue May 22 13:45:58 2007 New Revision: 38079 URL: http://svn.opensuse.org/viewcvs/yast?rev=38079&view=rev Log: - 2.15.8 - disabled test button due to problems with multiple X-Server instances (#264646) Modified: trunk/x11/VERSION trunk/x11/package/yast2-x11.changes trunk/x11/src/proposal/x11_proposal.ycp Modified: trunk/x11/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/VERSION?rev=38079&r1=38078&r… ============================================================================== --- trunk/x11/VERSION (original) +++ trunk/x11/VERSION Tue May 22 13:45:58 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Tue May 22 13:45:58 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue May 22 11:25:41 CEST 2007 - ms(a)suse.de + +- 2.15.8 +- disabled test button due to problems with multiple X-Server + instances (#264646) + +------------------------------------------------------------------- Wed May 9 12:13:22 CEST 2007 - ms(a)suse.de - 2.15.7 Modified: trunk/x11/src/proposal/x11_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/proposal/x11_proposal.yc… ============================================================================== --- trunk/x11/src/proposal/x11_proposal.ycp (original) +++ trunk/x11/src/proposal/x11_proposal.ycp Tue May 22 13:45:58 2007 @@ -218,13 +218,14 @@ //====================================== // Test your configuration now //-------------------------------------- - if (! isFbdevBased) { - proposal = proposal - + LI - + "<a href=\"sax-test\">" - + XMessages::testConfig + "</a>" - + IL; - } + // deactivated due to problems with multiple X-Server instances + //if (! isFbdevBased) { + // proposal = proposal + // + LI + // + "<a href=\"sax-test\">" + // + XMessages::testConfig + "</a>" + // + IL; + //} //====================================== // End proposal... //-------------------------------------- -- 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] r38078 - /tags/stable-2_15_10/autoinstallation/
by ug＠svn.opensuse.org 22 May '07

22 May '07

Author: ug Date: Tue May 22 11:13:25 2007 New Revision: 38078 URL: http://svn.opensuse.org/viewcvs/yast?rev=38078&view=rev Log: Created tag stable-2_15_10 for autoinstallation Added: tags/stable-2_15_10/autoinstallation/ - copied from r38077, trunk/autoinstallation/ -- 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] r38077 - /tags/stable-2_15_26/installation/
by ug＠svn.opensuse.org 22 May '07

22 May '07

Author: ug Date: Tue May 22 11:10:02 2007 New Revision: 38077 URL: http://svn.opensuse.org/viewcvs/yast?rev=38077&view=rev Log: Created tag stable-2_15_26 for installation Added: tags/stable-2_15_26/installation/ - copied from r38076, trunk/installation/ -- 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] r38076 - in /trunk/autoinstallation: VERSION package/autoyast2.changes src/clients/inst_autoinit.ycp
by ug＠svn.opensuse.org 22 May '07

22 May '07

Author: ug Date: Tue May 22 10:57:52 2007 New Revision: 38076 URL: http://svn.opensuse.org/viewcvs/yast?rev=38076&view=rev Log: reactivate hardware detection. 2.15.10 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autoinit.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=380… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Tue May 22 10:57:52 2007 @@ -1 +1 @@ -2.15.9 +2.15.10 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue May 22 10:57:52 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 10:57:06 CEST 2007 - ug(a)suse.de + +- reactivate hardware detection during autoinstall +- 2.15.10 + +------------------------------------------------------------------- Wed May 16 12:30:53 CEST 2007 - ug(a)suse.de - always remove the installation network Modified: trunk/autoinstallation/src/clients/inst_autoinit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoinit.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoinit.ycp Tue May 22 10:57:52 2007 @@ -163,7 +163,7 @@ } Progress::Title(_("Probing hardware...")); - WFM::CallFunction("inst_startup", [] ); + WFM::CallFunction("inst_system_analysis", [] ); if( ! profileFetched ) { symbol ret = processProfile(); -- 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] r38075 - /tags/stable-2_15_9/add-on-creator/
by jsuchome＠svn.opensuse.org 22 May '07

22 May '07

Author: jsuchome Date: Tue May 22 10:56:26 2007 New Revision: 38075 URL: http://svn.opensuse.org/viewcvs/yast?rev=38075&view=rev Log: Created tag stable-2_15_9 for add-on-creator Added: tags/stable-2_15_9/add-on-creator/ - copied from r38074, trunk/add-on-creator/ -- 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] r38074 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/add-on-creator.ycp src/complex.ycp
by jsuchome＠svn.opensuse.org 22 May '07

22 May '07

Author: jsuchome Date: Tue May 22 10:56:08 2007 New Revision: 38074 URL: http://svn.opensuse.org/viewcvs/yast?rev=38074&view=rev Log: - enable rpm directory with .rpm extension (#276861) - 2.15.9 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/add-on-creator.ycp trunk/add-on-creator/src/complex.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=38074… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Tue May 22 10:56:08 2007 @@ -1 +1 @@ -2.15.8 +2.15.9 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Tue May 22 10:56:08 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 10:42:36 CEST 2007 - jsuchome(a)suse.cz + +- enable rpm directory with .rpm extension (#276861) +- 2.15.9 + +------------------------------------------------------------------- Mon May 21 13:21:12 CEST 2007 - jsuchome(a)suse.cz - fixed signing content file (#275883) Modified: trunk/add-on-creator/src/add-on-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creato… ============================================================================== --- trunk/add-on-creator/src/add-on-creator.ycp (original) +++ trunk/add-on-creator/src/add-on-creator.ycp Tue May 22 10:56:08 2007 @@ -272,13 +272,16 @@ boolean CreateAddOn (map<string,any> options) { AddOnCreator::clone = false; - AddOnCreator::rpm_path = options["rpm_dir"]:""; - if (AddOnCreator::rpm_path == "") + string rpm_dir = options["rpm_dir"]:""; + if (rpm_dir == "") { // error message Report::Error (_("Path to directory with packages is missing.")); return false; } + if (substring (rpm_dir, size (rpm_dir) - 1, 1) != "/") + rpm_dir = rpm_dir + "/"; + AddOnCreator::rpm_path = rpm_dir; if (!haskey (options, "content")) { // error message Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?r… ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Tue May 22 10:56:08 2007 @@ -330,7 +330,11 @@ UI::SetFocus (`id(`required_rpm_path)); continue; } + if (substring (dir, size (dir) - 1, 1) != "/") + dir = dir + "/"; AddOnCreator::rpm_path = dir; + if (req_dir != "" && substring (req_dir, size (req_dir) - 1, 1) != "/") + req_dir = req_dir + "/"; AddOnCreator::required_rpm_path = req_dir; if (requires == "") requires = (string) UI::QueryWidget (`id(`other_val), `Value); -- 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] r38073 - /tags/branch-SLE-10-SP1-2_13_20/add-on-creator/
by jsuchome＠svn.opensuse.org 22 May '07

22 May '07

Author: jsuchome Date: Tue May 22 10:54:21 2007 New Revision: 38073 URL: http://svn.opensuse.org/viewcvs/yast?rev=38073&view=rev Log: Created tag branch-SLE-10-SP1-2_13_20 for add-on-creator Added: tags/branch-SLE-10-SP1-2_13_20/add-on-creator/ - copied from r38072, branches/SuSE-SLE-10-SP1-Branch/add-on-creator/ -- 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] r38072 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_system_analysis.ycp
by ug＠svn.opensuse.org 22 May '07

22 May '07

Author: ug Date: Tue May 22 10:53:21 2007 New Revision: 38072 URL: http://svn.opensuse.org/viewcvs/yast?rev=38072&view=rev Log: reactivate hardware detection during autoinstall. 2.15.26 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_system_analysis.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=38072&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue May 22 10:53:21 2007 @@ -1 +1 @@ -2.15.25 +2.15.26 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue May 22 10:53:21 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 10:51:57 CEST 2007 - ug(a)suse.de + +- reactivate hardware detection during autoinstall +- 2.15.26 + +------------------------------------------------------------------- Mon May 21 10:40:20 CEST 2007 - locilka(a)suse.cz - Fixed release-notes desktop file. Modified: trunk/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sy… ============================================================================== --- trunk/installation/src/clients/inst_system_analysis.ycp (original) +++ trunk/installation/src/clients/inst_system_analysis.ycp Tue May 22 10:53:21 2007 @@ -296,7 +296,7 @@ y2milestone ("Probing done: %1", Installation::probing_done); if (! Installation::probing_done) { - if (!Mode::autoinst ()) { +// if (!Mode::autoinst ()) { if (!(Arch::s390 () || Arch::board_iseries ())) { // TRANSLATORS: progress step actions_todo = add (actions_todo, _("Probe USB devices")); @@ -337,7 +337,7 @@ WFM::CallFunction("inst_features", []); Installation::probing_done = true; - } +// } } // TRANSLATORS: progress step -- 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] r38071 - in /branches/SuSE-SLE-10-SP1-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/add-on-creator.ycp src/complex.ycp
by jsuchome＠svn.opensuse.org 22 May '07

22 May '07

Author: jsuchome Date: Tue May 22 10:50:27 2007 New Revision: 38071 URL: http://svn.opensuse.org/viewcvs/yast?rev=38071&view=rev Log: - enable rpm directory with .rpm extension (#276861) - 2.13.20 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/add-on-creator.ycp branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/complex.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION Tue May 22 10:50:27 2007 @@ -1 +1 @@ -2.13.19 +2.13.20 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes Tue May 22 10:50:27 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 22 10:40:53 CEST 2007 - jsuchome(a)suse.cz + +- enable rpm directory with .rpm extension (#276861) +- 2.13.20 + +------------------------------------------------------------------- Mon May 21 10:46:20 CEST 2007 - jsuchome(a)suse.cz - fixed signing content file (#275883) Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/add-on-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/add-on-creator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/add-on-creator.ycp Tue May 22 10:50:27 2007 @@ -272,13 +272,16 @@ boolean CreateAddOn (map<string,any> options) { AddOnCreator::clone = false; - AddOnCreator::rpm_path = options["rpm_dir"]:""; - if (AddOnCreator::rpm_path == "") + string rpm_dir = options["rpm_dir"]:""; + if (rpm_dir == "") { // error message Report::Error (_("Path to directory with packages is missing.")); return false; } + if (substring (rpm_dir, size (rpm_dir) - 1, 1) != "/") + rpm_dir = rpm_dir + "/"; + AddOnCreator::rpm_path = rpm_dir; if (!haskey (options, "content")) { // error message Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/complex.ycp Tue May 22 10:50:27 2007 @@ -330,7 +330,11 @@ UI::SetFocus (`id(`required_rpm_path)); continue; } + if (substring (dir, size (dir) - 1, 1) != "/") + dir = dir + "/"; AddOnCreator::rpm_path = dir; + if (req_dir != "" && substring (req_dir, size (req_dir) - 1, 1) != "/") + req_dir = req_dir + "/"; AddOnCreator::required_rpm_path = req_dir; if (requires == "") requires = (string) UI::QueryWidget (`id(`other_val), `Value); -- 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] r38070 - /tags/stable-2_15_4/vm/
by charlesa＠svn.opensuse.org 21 May '07

21 May '07

Author: charlesa Date: Mon May 21 21:24:04 2007 New Revision: 38070 URL: http://svn.opensuse.org/viewcvs/yast?rev=38070&view=rev Log: Created tag stable-2_15_4 for vm Added: tags/stable-2_15_4/vm/ - copied from r38069, trunk/vm/ -- 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] r38069 - in /trunk/vm: VERSION package/yast2-vm.changes src/virtualization.desktop src/xen.desktop yast2-vm.spec.in
by charlesa＠svn.opensuse.org 21 May '07

21 May '07

Author: charlesa Date: Mon May 21 19:49:24 2007 New Revision: 38069 URL: http://svn.opensuse.org/viewcvs/yast?rev=38069&view=rev Log: The 'Virtualization' category is missing and the virtualization icons are in the other category. (#258600) Update icon name in yast2-vm (#258519) Other cleanups in spec file. Modified: trunk/vm/VERSION trunk/vm/package/yast2-vm.changes trunk/vm/src/virtualization.desktop trunk/vm/src/xen.desktop trunk/vm/yast2-vm.spec.in Modified: trunk/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=38069&r1=38068&r2… ============================================================================== --- trunk/vm/VERSION (original) +++ trunk/vm/VERSION Mon May 21 19:49:24 2007 @@ -1 +1 @@ -2.15.3 +2.15.4 Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Mon May 21 19:49:24 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 21 08:29:37 MDT 2007 - carnold(a)novell.com + +- The 'Virtualization' category is missing and the virtualization + icons are in the other category. (#258600) +- Update icon name in yast2-vm (#258519) + +------------------------------------------------------------------- Mon Mar 12 10:16:40 MDT 2007 - carnold(a)novell.com - Change the check for xenbr0 to xenbr+. (#233934) Modified: trunk/vm/src/virtualization.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/virtualization.desktop?re… ============================================================================== --- trunk/vm/src/virtualization.desktop (original) +++ trunk/vm/src/virtualization.desktop Mon May 21 19:49:24 2007 @@ -1,5 +1,4 @@ [Desktop Entry] -# X-SuSE-DocTeamID=ycc_Virtualization Type=Application Categories=Qt;X-SuSE-YaST-Virtualization; @@ -15,5 +14,3 @@ Icon=yast-host Name=Virtualization - -X-SuSE-translate=true Modified: trunk/vm/src/xen.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/xen.desktop?rev=38069&r1=… ============================================================================== --- trunk/vm/src/xen.desktop (original) +++ trunk/vm/src/xen.desktop Mon May 21 19:49:24 2007 @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-DocTeamID=ycc_xen Type=Application Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; @@ -16,11 +15,9 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoinstResource= -Icon=yast-uml +Icon=yast-vm-install Exec=/sbin/yast2 xen Name=Install Hypervisor and Tools GenericName=Install Hypervisor and Tools X-KDE-SubstituteUID=true - -X-SuSE-translate=true Modified: trunk/vm/yast2-vm.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/yast2-vm.spec.in?rev=38069&r1… ============================================================================== --- trunk/vm/yast2-vm.spec.in (original) +++ trunk/vm/yast2-vm.spec.in Mon May 21 19:49:24 2007 @@ -15,10 +15,6 @@ @BUILD@ @INSTALL@ -for f in `find $RPM_BUILD_ROOT/usr/share/applications/YaST2/groups/*.desktop` ; do - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done @CLEAN@ -- 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] r38068 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/data/isolinux.cfg
by lslezak＠svn.opensuse.org 21 May '07

21 May '07

Author: lslezak Date: Mon May 21 17:01:29 2007 New Revision: 38068 URL: http://svn.opensuse.org/viewcvs/yast?rev=38068&view=rev Log: - fixed the default boot item in isolinux.cfg for AutoYast installation (#275911) Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/data/isolinux.cfg Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Mon May 21 17:01:29 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 21 16:58:32 CEST 2007 - lslezak(a)suse.cz + +- fixed the default boot item in isolinux.cfg for AutoYast + installation (#275911) + +------------------------------------------------------------------- Mon May 21 14:34:30 CEST 2007 - lslezak(a)suse.cz - fixed workflow: display the GPG dialog also if an AutoYast Modified: branches/tmp/lslezak/cd-creator/src/data/isolinux.cfg URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/da… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/data/isolinux.cfg (original) +++ branches/tmp/lslezak/cd-creator/src/data/isolinux.cfg Mon May 21 17:01:29 2007 @@ -2,8 +2,7 @@ # hard disk label harddisk - kernel linux - append SLX=0x202 showopts + localboot 0x80 # autoyast label AutoYaST -- 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] r38067 - in /trunk/yast2: package/yast2.changes scripts/yast2
by kmachalkova＠svn.opensuse.org 21 May '07

21 May '07

Author: kmachalkova Date: Mon May 21 16:37:12 2007 New Revision: 38067 URL: http://svn.opensuse.org/viewcvs/yast?rev=38067&view=rev Log: - Do not show empty xmessage window if nothing is printed to stderr after yast module has exited (mvidner's patch for #265263) Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon May 21 16:37:12 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 21 16:04:31 CEST 2007 - kmachalkova(a)suse.cz + +- Do not show empty xmessage window if nothing is printed to stderr + after yast module has exited (mvidner's patch for #265263) + +------------------------------------------------------------------- Mon May 21 13:39:58 CEST 2007 - jsrain(a)suse.cz - fixed chrp board detection (PPC) (#273606) Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=38067&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Mon May 21 16:37:12 2007 @@ -17,14 +17,26 @@ # load common script functions . /usr/lib/YaST2/bin/yast2-funcs +# redirect to $@ if the input is not empty, #265263 +redir_nonempty() +{ + local IFS='' L + read L || return + exec &> >("$@") + echo "$L" + cat +} + # #211392 # if we are in X and do not have _input_ from terminal, # make it output to xmessage redirect() { - XMESSAGE=`type -p xmessage` - if $REDIRECT && [ -n "$DISPLAY" -a ! -t 0 -a -n "$XMESSAGE" ]; then - exec &> >($XMESSAGE -buttons OK:0 -default OK -center -file -) + if [ -n "$DISPLAY" -a ! -t 0 ]; then + XMESSAGE=`type -p xmessage` + if [ -n "$XMESSAGE" ]; then + exec &> >(redir_nonempty $XMESSAGE -buttons OK:0 -default OK -center -file -) + fi fi } # redirect the output if necessary -- 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] r38066 - in /branches/tmp/sh/mod-ui/qt: SUBDIRS testsuite/
by sh-sh-sh＠svn.opensuse.org 21 May '07

21 May '07

Author: sh-sh-sh Date: Mon May 21 16:01:17 2007 New Revision: 38066 URL: http://svn.opensuse.org/viewcvs/yast?rev=38066&view=rev Log: Got rid of utterly useless testsuite Removed: branches/tmp/sh/mod-ui/qt/testsuite/ Modified: branches/tmp/sh/mod-ui/qt/SUBDIRS Modified: branches/tmp/sh/mod-ui/qt/SUBDIRS URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/SUBDIRS?rev=… ============================================================================== --- branches/tmp/sh/mod-ui/qt/SUBDIRS (original) +++ branches/tmp/sh/mod-ui/qt/SUBDIRS Mon May 21 16:01:17 2007 @@ -1 +1 @@ -src doc fonts testsuite +src doc fonts -- 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] r38065 - in /branches/tmp/sh/mod-ui/core/libyui: Makefile.am testsuite/
by sh-sh-sh＠svn.opensuse.org 21 May '07

21 May '07

Author: sh-sh-sh Date: Mon May 21 15:54:59 2007 New Revision: 38065 URL: http://svn.opensuse.org/viewcvs/yast?rev=38065&view=rev Log: Got rid of utterly useless testsuite Removed: branches/tmp/sh/mod-ui/core/libyui/testsuite/ Modified: branches/tmp/sh/mod-ui/core/libyui/Makefile.am Modified: branches/tmp/sh/mod-ui/core/libyui/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/Mak… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/Makefile.am Mon May 21 15:54:59 2007 @@ -2,4 +2,4 @@ # Makefile.am for core/libyui # -SUBDIRS = src doc testsuite +SUBDIRS = src doc -- 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] r38064 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/wizards.ycp
by lslezak＠svn.opensuse.org 21 May '07

21 May '07

Author: lslezak Date: Mon May 21 14:37:22 2007 New Revision: 38064 URL: http://svn.opensuse.org/viewcvs/yast?rev=38064&view=rev Log: - fixed workflow: display the GPG dialog also if an AutoYast profile is used for package selection (#275913) Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/wizards.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Mon May 21 14:37:22 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 21 14:34:30 CEST 2007 - lslezak(a)suse.cz + +- fixed workflow: display the GPG dialog also if an AutoYast + profile is used for package selection (#275913) + +------------------------------------------------------------------- Mon May 21 11:10:16 CEST 2007 - lslezak(a)suse.cz - always store isolinux.cfg into the config file, even if there Modified: branches/tmp/lslezak/cd-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/wi… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/wizards.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/wizards.ycp Mon May 21 14:37:22 2007 @@ -57,7 +57,7 @@ "isolinux": $[ `abort : `abort, `next : "packagemanager", - `autoyast : "summary" + `autoyast : "gpgkey" ], "packagemanager": $[ `abort : `abort, -- 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] r38063 - in /trunk/network: package/yast2-network.changes src/modules/DNS.ycp
by kmachalkova＠svn.opensuse.org 21 May '07

21 May '07

Author: kmachalkova Date: Mon May 21 14:01:40 2007 New Revision: 38063 URL: http://svn.opensuse.org/viewcvs/yast?rev=38063&view=rev Log: IsHostLocal test extended to include also hostname and/or IP set by DHCP (#163170) Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/DNS.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 21 14:01:40 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 21 13:57:47 CEST 2007 - kmachalkova(a)suse.cz + +- IsHostLocal test extended to include also hostname and/or IP set by + DHCP (#163170) + +------------------------------------------------------------------- Mon May 14 10:52:43 CEST 2007 - kmachalkova(a)suse.cz - Correct comparison of installed and downloaded release notes Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Mon May 21 14:01:40 2007 @@ -88,6 +88,26 @@ return true; } +/* + * Get current hostname and IP Address + * if these are set by DHCP + * @return map with ip, hostname_short and hostname_fq keys + */ +global define map <string, string> GetDHCPHostnameIP () { + map <string, string> ret = $[]; + + map output = (map) SCR::Execute(.target.bash_output, "hostname -i"); + ret["ip"] = deletechars(output["stdout"]:"", " \n"); + + output = (map) SCR::Execute(.target.bash_output, "hostname"); + ret["hostname_short"] = deletechars(output["stdout"]:"", " \n"); + + output = (map) SCR::Execute(.target.bash_output, "hostname -f"); + ret["hostname_fq"] = deletechars(output["stdout"]:"", " \n"); + + return ret; +} + /** * resolver config file location */ @@ -405,10 +425,17 @@ */ global define boolean IsHostLocal (string check_host) { Read (); + NetworkDevices::Read (); + map <string, string> dhcp_data = $[]; + + if ( (size( NetworkDevices::Locate("BOOTPROTO", "dhcp") ) > 0) || + NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false == true ) { + dhcp_data = GetDHCPHostnameIP(); + y2milestone("Got DHCP-configured data: %1", dhcp_data); + } /* FIXME: May not work properly in following situations: - multiple addresses per interface - aliases in /etc/hosts - - hostname or IP address is set through DHCP - IPADDR=IP/24 */ @@ -422,8 +449,9 @@ // IPv4 address if (IP::Check4 (check_host)) { - NetworkDevices::Read (); - return 0 != size (NetworkDevices::Locate ("IPADDR", check_host)); + if ( (size (NetworkDevices::Locate ("IPADDR", check_host)) > 0) + || dhcp_data["ip"]:"" == check_host) + return true; } // IPv6 address else if (IP::Check6 (check_host)) @@ -433,12 +461,16 @@ // short hostname else if (findfirstof (check_host, ".") == nil) { - return tolower (check_host) == tolower (hostname); + if ( (tolower (check_host) == tolower (hostname)) + || dhcp_data["hostname_short"]:"" == check_host) + return true; } // fully qualified hostname else { - return tolower (check_host) == tolower (hostname + "." + domain); + if ( (tolower (check_host) == tolower (hostname + "." + domain)) + || dhcp_data["hostname_fq"]:"" == check_host ) + return true; } return false; } -- 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] r38062 - /tags/stable-2_15_8/add-on-creator/
by jsuchome＠svn.opensuse.org 21 May '07

21 May '07

Author: jsuchome Date: Mon May 21 13:34:12 2007 New Revision: 38062 URL: http://svn.opensuse.org/viewcvs/yast?rev=38062&view=rev Log: Created tag stable-2_15_8 for add-on-creator Added: tags/stable-2_15_8/add-on-creator/ - copied from r38061, trunk/add-on-creator/ -- 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] r38061 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 21 May '07

21 May '07

Author: jsuchome Date: Mon May 21 13:34:03 2007 New Revision: 38061 URL: http://svn.opensuse.org/viewcvs/yast?rev=38061&view=rev Log: - fixed signing content file (#275883) - fixed exporting gpg key (#275900) - 2.15.8 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=38061… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Mon May 21 13:34:03 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon May 21 13:34:03 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 21 13:21:12 CEST 2007 - jsuchome(a)suse.cz + +- fixed signing content file (#275883) +- fixed exporting gpg key (#275900) +- 2.15.8 + +------------------------------------------------------------------- Thu May 17 16:42:33 CEST 2007 - jsuchome(a)suse.cz - clear pattern data map before importing next one (#273528) Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Mon May 21 13:34:03 2007 @@ -1631,28 +1631,12 @@ string pw_path = tmpdir + "/pw"; SCR::Write (.target.string, pw_path, passphrase); - // sign the content file - SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); - out = (map) SCR::Execute (.target.bash_output, sformat(" - gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", - local_key, base_path, pw_path) - ); - if (out["exit"]:0 != 0) - { - if (Mode::commandline ()) - Report::Error (out["stderr"]:""); - else - // error message - Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); - return false; - } - // export the key: command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'", local_key, base_path, big_key); SCR::Execute (.target.bash, command, $["LANG" : "C"]); - // than, make a sha1 sum of that key (content file is modified last time) + // make a sha1 sum of that key (content file is modified last time) out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1'; ls -A1 gpg-pubkey*", base_path)); @@ -1666,8 +1650,24 @@ SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + // sign the content file + SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); + out = (map) SCR::Execute (.target.bash_output, sformat(" + gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", + local_key, base_path, pw_path) + ); + if (out["exit"]:0 != 0) + { + if (Mode::commandline ()) + Report::Error (out["stderr"]:""); + else + // error message + Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); + return false; + } + SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2/content.key'",local_key, base_path)); + sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); // sign products file string products_path = full_media_paths[0]:"" + "/products"; @@ -1678,7 +1678,7 @@ sformat("gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2.key'", local_key,products_path)); + sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); } SCR::Execute (.target.remove, pw_path); return true; -- 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] r38060 - /tags/branch-SLE-10-SP1-2_13_19/add-on-creator/
by jsuchome＠svn.opensuse.org 21 May '07

21 May '07

Author: jsuchome Date: Mon May 21 13:24:48 2007 New Revision: 38060 URL: http://svn.opensuse.org/viewcvs/yast?rev=38060&view=rev Log: Created tag branch-SLE-10-SP1-2_13_19 for add-on-creator Added: tags/branch-SLE-10-SP1-2_13_19/add-on-creator/ - copied from r38059, branches/SuSE-SLE-10-SP1-Branch/add-on-creator/ -- 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] r38059 - in /branches/SuSE-SLE-10-SP1-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 21 May '07

21 May '07

Author: jsuchome Date: Mon May 21 13:24:40 2007 New Revision: 38059 URL: http://svn.opensuse.org/viewcvs/yast?rev=38059&view=rev Log: - fixed signing content file (#275883) - fixed exporting gpg key (#275900) - 2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION Mon May 21 13:24:40 2007 @@ -1 +1 @@ -2.13.18 +2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes Mon May 21 13:24:40 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 21 10:46:20 CEST 2007 - jsuchome(a)suse.cz + +- fixed signing content file (#275883) +- fixed exporting gpg key (#275900) +- 2.13.19 + +------------------------------------------------------------------- Thu May 17 16:44:59 CEST 2007 - jsuchome(a)suse.cz - clear pattern data map before importing next one (#273528) Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Mon May 21 13:24:40 2007 @@ -1631,28 +1631,12 @@ string pw_path = tmpdir + "/pw"; SCR::Write (.target.string, pw_path, passphrase); - // sign the content file - SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); - out = (map) SCR::Execute (.target.bash_output, sformat(" - gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", - local_key, base_path, pw_path) - ); - if (out["exit"]:0 != 0) - { - if (Mode::commandline ()) - Report::Error (out["stderr"]:""); - else - // error message - Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); - return false; - } - // export the key: command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'", local_key, base_path, big_key); SCR::Execute (.target.bash, command, $["LANG" : "C"]); - // than, make a sha1 sum of that key (content file is modified last time) + // make a sha1 sum of that key (content file is modified last time) out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1'; ls -A1 gpg-pubkey*", base_path)); @@ -1666,8 +1650,24 @@ SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + // sign the content file + SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); + out = (map) SCR::Execute (.target.bash_output, sformat(" + gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", + local_key, base_path, pw_path) + ); + if (out["exit"]:0 != 0) + { + if (Mode::commandline ()) + Report::Error (out["stderr"]:""); + else + // error message + Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); + return false; + } + SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2/content.key'",local_key, base_path)); + sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); // sign products file string products_path = full_media_paths[0]:"" + "/products"; @@ -1678,7 +1678,7 @@ sformat("gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2.key'", local_key,products_path)); + sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); } SCR::Execute (.target.remove, pw_path); return true; -- 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] r38058 - in /trunk/packager: package/yast2-packager.changes src/modules/SourceDialogs.ycp
by jsrain＠svn.opensuse.org 21 May '07

21 May '07

Author: jsrain Date: Mon May 21 13:01:51 2007 New Revision: 38058 URL: http://svn.opensuse.org/viewcvs/yast?rev=38058&view=rev Log: check if host name specified is valid (#232887) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon May 21 13:01:51 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 21 13:59:38 CEST 2007 - jsrain(a)suse.cz + +- check if host name specified is valid (#232887) + +------------------------------------------------------------------- Thu May 17 12:29:56 CEST 2007 - locilka(a)suse.cz - Sort licenses alphabetically using an lsort instead of common Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Mon May 21 13:01:51 2007 @@ -27,6 +27,7 @@ import "Report"; import "NetworkPopup"; import "String"; +import "Hostname"; // common functions / data @@ -827,6 +828,19 @@ } } +boolean ServerValidate (string key, map event) { + string host = NormalizeHost ((string)UI::QueryWidget (`id (`server), `Value)); + if (! Hostname::CheckFQ (host)) + { + UI::SetFocus (`server); + Popup::Message (Hostname::ValidFQ ()); + return false; + } + + return true; +} + + /** * Store function of a widget * @param key string widget key @@ -898,6 +912,13 @@ directory = directory + ";workgroup=" + workgroup; } parsed["path"] = directory; + + // set HTTP/HTTPS port + if (type == `http || type == `https) + { + parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value); + } + y2milestone("Entered URL: %1", parsed); _url = URL::Build (parsed); y2milestone("URL::Build: %1", _url); @@ -908,11 +929,6 @@ _url = PosprocessISOURL (_url); } - // set HTTP/HTTPS port - if (type == `http || type == `https) - { - parsed["port"] = (string)UI::QueryWidget(`id(`port), `Value); - } } @@ -935,6 +951,8 @@ `ReplacePoint (`id (`server_rp), `Empty ()) ), "init" : ServerInit, + "validate_type" : `function, + "validate_function" : ServerValidate, "store" : ServerStore, "handle" : ServerHandle, // help text - server dialog -- 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] r38057 - in /trunk/yast2: library/cwm/src/CWMServiceStart.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 21 May '07

21 May '07

Author: jsrain Date: Mon May 21 12:42:18 2007 New Revision: 38057 URL: http://svn.opensuse.org/viewcvs/yast?rev=38057&view=rev Log: do not check UI mode when enabling the 'Use LDAP' widget in service dialog (#274649) Modified: trunk/yast2/library/cwm/src/CWMServiceStart.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/cwm/src/CWMServiceStart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/cwm/src/CWMService… ============================================================================== --- trunk/yast2/library/cwm/src/CWMServiceStart.ycp (original) +++ trunk/yast2/library/cwm/src/CWMServiceStart.ycp Mon May 21 12:42:18 2007 @@ -679,8 +679,7 @@ ); if (! (haskey (settings, "get_use_ldap") - && haskey (settings, "set_use_ldap") - && ProductFeatures::GetFeature ("globals", "ui_mode") != "simple")) + && haskey (settings, "set_use_ldap"))) { ldap_settings = `VBox (); help = ""; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon May 21 12:42:18 2007 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Mon May 21 10:45:35 CEST 2007 - jsrain(a)suse.cz +Mon May 21 13:39:58 CEST 2007 - jsrain(a)suse.cz - fixed chrp board detection (PPC) (#273606) +- do not check UI mode when enabling the 'Use LDAP' widget in + service dialog (#274649) ------------------------------------------------------------------- Thu May 17 17:57:17 CEST 2007 - lslezak(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] r38056 - in /branches/tmp/lslezak/cd-creator: package/yast2-product-creator.changes src/ProductCreator.ycp src/dialogs.ycp
by lslezak＠svn.opensuse.org 21 May '07

21 May '07

Author: lslezak Date: Mon May 21 11:31:46 2007 New Revision: 38056 URL: http://svn.opensuse.org/viewcvs/yast?rev=38056&view=rev Log: - always store isolinux.cfg into the config file, even if there is no change (#275914) Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp branches/tmp/lslezak/cd-creator/src/dialogs.ycp Modified: branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/packag… ============================================================================== --- branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes (original) +++ branches/tmp/lslezak/cd-creator/package/yast2-product-creator.changes Mon May 21 11:31:46 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 21 11:10:16 CEST 2007 - lslezak(a)suse.cz + +- always store isolinux.cfg into the config file, even if there + is no change (#275914) + +------------------------------------------------------------------- Wed May 16 14:23:57 CEST 2007 - jsuchome(a)suse.cz - added widgets for 'root' and 'config' directory editation Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/Pr… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Mon May 21 11:31:46 2007 @@ -1719,11 +1719,6 @@ : sformat("%1/boot/loader/isolinux.cfg", skel_root); SCR::Write(.target.string, fname, Config["bootconfig"]:"" ); - /* - string cpCmd = sformat("cp %1/product-creator/isolinux.cfg %2/boot/loader", - Directory::datadir, skel_root); - SCR::Execute (.target.bash, cpCmd); - */ } cpCmd = (Config["code10"]:false) ? sformat("cp %1/product-creator/message %2/boot/%3/loader", Directory::datadir, skel_root, arch) Modified: branches/tmp/lslezak/cd-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/di… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/dialogs.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/dialogs.ycp Mon May 21 11:31:46 2007 @@ -649,11 +649,8 @@ } else if(ret == `next) { string isolinux_new = (string)UI::QueryWidget(`id(`isolinux), `Value); - if (isolinux_new != isolinux) - { - ProductCreator::Config["bootconfig"] = isolinux_new; - } - + ProductCreator::Config["bootconfig"] = isolinux_new; + y2milestone("Isolinux config: %1", isolinux_new); 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] r38055 - /tags/stable-2_15_25/installation/
by locilka＠svn.opensuse.org 21 May '07

21 May '07

Author: locilka Date: Mon May 21 10:41:09 2007 New Revision: 38055 URL: http://svn.opensuse.org/viewcvs/yast?rev=38055&view=rev Log: Created tag stable-2_15_25 for installation Added: tags/stable-2_15_25/installation/ - copied from r38054, trunk/installation/ -- 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] r38054 - in /trunk/installation: VERSION package/yast2-installation.changes src/config/release_notes.desktop
by locilka＠svn.opensuse.org 21 May '07

21 May '07

Author: locilka Date: Mon May 21 10:40:53 2007 New Revision: 38054 URL: http://svn.opensuse.org/viewcvs/yast?rev=38054&view=rev Log: - Fixed release-notes desktop file. - 2.15.25 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/config/release_notes.desktop Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=38054&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon May 21 10:40:53 2007 @@ -1 +1 @@ -2.15.24 +2.15.25 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon May 21 10:40:53 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 21 10:40:20 CEST 2007 - locilka(a)suse.cz + +- Fixed release-notes desktop file. +- 2.15.25 + +------------------------------------------------------------------- Thu May 17 22:18:29 CEST 2007 - locilka(a)suse.cz - Progress dialog for initializing installation sources. Modified: trunk/installation/src/config/release_notes.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/release_… ============================================================================== --- trunk/installation/src/config/release_notes.desktop (original) +++ trunk/installation/src/config/release_notes.desktop Mon May 21 10:40:53 2007 @@ -1,5 +1,4 @@ [Desktop Entry] -X-SuSE-translate=true Type=Application Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; -- 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] r38053 - in /trunk/yast2: library/modules/Arch.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 21 May '07

21 May '07

Author: jsrain Date: Mon May 21 09:47:25 2007 New Revision: 38053 URL: http://svn.opensuse.org/viewcvs/yast?rev=38053&view=rev Log: fixed chrp board detection (PPC) (#273606) Modified: trunk/yast2/library/modules/Arch.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/modules/Arch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Arch.ycp?r… ============================================================================== --- trunk/yast2/library/modules/Arch.ycp (original) +++ trunk/yast2/library/modules/Arch.ycp Mon May 21 09:47:25 2007 @@ -235,8 +235,7 @@ string board = model["stdout"]:""; y2milestone("model %1 , device_type %2\n", model, device_type); // catch remaining IBM boards - if (device_type["stdout"]:"" == "chrp" - || device_type["stdout"]:"" == "chrp-cbea") + if (issubstring (device_type["stdout"]:"", "chrp")) { _board_compatible = "CHRP"; } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon May 21 09:47:25 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 21 10:45:35 CEST 2007 - jsrain(a)suse.cz + +- fixed chrp board detection (PPC) (#273606) + +------------------------------------------------------------------- Thu May 17 17:57:17 CEST 2007 - lslezak(a)suse.cz - Fixed testsuite for String.ycp -- 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] r38052 - in /trunk/kdump/src: dialogs.ycp uifunctions.ycp
by juhliarik＠svn.opensuse.org 21 May '07

21 May '07

Author: juhliarik Date: Mon May 21 09:16:23 2007 New Revision: 38052 URL: http://svn.opensuse.org/viewcvs/yast?rev=38052&view=rev Log: added corrections for UI Modified: trunk/kdump/src/dialogs.ycp trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=38052&… ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Mon May 21 09:16:23 2007 @@ -233,13 +233,15 @@ "widget" : `custom, "custom_widget" : `VBox( `Frame ( _("Dump Level"), `VBox( - `Left(`HBox(`HSpacing(1),`HBox( + `Left(`HBox(`HSpacing(1),`VBox( `Left(`CheckBox(`id("zero_page"), "&Zero Page")), `Left(`CheckBox(`id("cache_page"), `opt(`notify), "Cach&e Page")), - `Left(`CheckBox(`id("cache_private"), `opt(`notify), "Cache Priva&te")), + `HBox(`HSpacing(2),`VBox( + `Left(`CheckBox(`id("cache_private"), `opt(`notify), "Cache Priva&te")) + )), `Left(`CheckBox(`id("user_data"), "&User Data")), - `Left(`CheckBox(`id("free_page"), "&Free Page")), - `HStretch () + `Left(`CheckBox(`id("free_page"), "&Free Page")) + //`VStretch () ))) ))), "init" : InitDumpLevel, Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=38… ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Mon May 21 09:16:23 2007 @@ -107,13 +107,12 @@ term ssh = `VBox( `Frame(_("SSH (scp)"),`HBox(`HSpacing(1),`VBox( - `Left(`TextEntry(`id ("server"), _("Server Nam&e"))), `Left(`HBox( - `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), - // text entry + `Left(`TextEntry(`id ("server"), _("Server Nam&e"))), `Left(`TextEntry(`id ("port"), _("P&ort"))), `HStretch () )), + `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), // text entry `Left(`TextEntry(`id ("username"), _("&User Name"))), // password entry -- 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] r38051 - /tags/stable-2_15_24/installation/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:52:01 2007 New Revision: 38051 URL: http://svn.opensuse.org/viewcvs/yast?rev=38051&view=rev Log: Created tag stable-2_15_24 for installation Added: tags/stable-2_15_24/installation/ - copied from r38050, trunk/installation/ -- 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] r38050 - in /trunk/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:50:20 2007 New Revision: 38050 URL: http://svn.opensuse.org/viewcvs/yast?rev=38050&view=rev Log: 2.15.24 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=38050&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri May 18 17:50:20 2007 @@ -1 +1 @@ -2.15.23 +2.15.24 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri May 18 17:50:20 2007 @@ -2,6 +2,7 @@ Thu May 17 22:18:29 CEST 2007 - locilka(a)suse.cz - Progress dialog for initializing installation sources. +- 2.15.24 ------------------------------------------------------------------- Tue May 15 14:14:13 CEST 2007 - locilka(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] r38049 - /tags/stable-2_15_12/update/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:47:02 2007 New Revision: 38049 URL: http://svn.opensuse.org/viewcvs/yast?rev=38049&view=rev Log: Created tag stable-2_15_12 for update Added: tags/stable-2_15_12/update/ - copied from r38048, trunk/update/ -- 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] r38048 - /trunk/update/yast2-update.spec.in
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:45:17 2007 New Revision: 38048 URL: http://svn.opensuse.org/viewcvs/yast?rev=38048&view=rev Log: update-desktop-files into BuildRequires again Modified: trunk/update/yast2-update.spec.in Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Fri May 18 17:45:17 2007 @@ -1,7 +1,7 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: yast2-add-on yast2-packager perl-XML-Writer yast2 yast2-devtools yast2-testsuite +BuildRequires: yast2-add-on yast2-packager perl-XML-Writer yast2 yast2-devtools yast2-testsuite update-desktop-files Requires: yast2 Requires: yast2-installation Requires: yast2-packager -- 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] r38047 - /trunk/update/yast2-update.spec.in
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:35:28 2007 New Revision: 38047 URL: http://svn.opensuse.org/viewcvs/yast?rev=38047&view=rev Log: Added desktop file also back into spec file Modified: trunk/update/yast2-update.spec.in Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Fri May 18 17:35:28 2007 @@ -41,7 +41,7 @@ %files %defattr(-,root,root) @ybindir@/* -#@desktopdir@/*.desktop +@desktopdir@/*.desktop @moduledir@/* @clientdir@/*.ycp @yncludedir@/update -- 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] r38046 - /tags/stable-2_15_12/update/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:35:10 2007 New Revision: 38046 URL: http://svn.opensuse.org/viewcvs/yast?rev=38046&view=rev Log: Did not build :( Removed: tags/stable-2_15_12/update/ -- 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] r38045 - /tags/stable-2_15_12/update/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:27:31 2007 New Revision: 38045 URL: http://svn.opensuse.org/viewcvs/yast?rev=38045&view=rev Log: Created tag stable-2_15_12 for update Added: tags/stable-2_15_12/update/ - copied from r38044, trunk/update/ -- 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] r38044 - in /trunk/update: package/yast2-update.changes src/clients/update_proposal.ycp src/modules/Update.ycp
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:26:10 2007 New Revision: 38044 URL: http://svn.opensuse.org/viewcvs/yast?rev=38044&view=rev Log: - System Update functionality is allowed only when product versions are matching (can have a different name). Non-matching product means no possibility for System Update. Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/update_proposal.ycp trunk/update/src/modules/Update.ycp Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Fri May 18 17:26:10 2007 @@ -3,7 +3,8 @@ - System Update icon is back in Control Center (#274064) - System Update functionality is allowed only when product versions - are matching (can have a different name). + are matching (can have a different name). Non-matching product + means no possibility for System Update. - Warning is printed when versions match but product names are different (#274064). - System Update temporarily renamed to 'FACTORY Update'. Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Fri May 18 17:26:10 2007 @@ -414,10 +414,32 @@ "raw_proposal" : [] ]; } + // TRANSLATORS: unknown product (label) + string update_from = _("Unknown product"); + if (Update::installedVersion["show"]:"" != "" && Update::installedVersion["show"]:"?" != "?") { + update_from = Update::installedVersion["show"]:""; + } else if (Update::installedVersion["version"]:"" != "" && Update::installedVersion["version"]:"?" != "?") { + update_from = Update::installedVersion["name"]:""; + } + + // TRANSLATORS: unknown product (label) + string update_to = _("Unknown product"); + if (Update::updateVersion["show"]:"" != "") { + update_to = Update::updateVersion["show"]:""; + } else if (Update::updateVersion["version"]:"" != "") { + update_to = Update::updateVersion["name"]:""; + } + // when versions don't match and upgrade is not allowed (running system) if ((Update::installedVersion["version"]:"A" != Update::updateVersion["version"]:"B") && Update::disallow_upgrade) { - // proposal error - return $[ "warning" : _("Updating to another version is not supported from the running system."), + return $[ "warning" : sformat( + // TRANSLATORS: proposal error, %1 is the version of installed system + // %2 is the version being installed + _("Updating system to another version (%1 -> %2) is not supported on the running system. +Please, boot from the installation media and use a normal upgrade +or disable installation sources of products with different versions."), + update_from, update_to + ), "warning_level" : `fatal, "raw_proposal" : [] ]; } Modified: trunk/update/src/modules/Update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/Update.ycp?re… ============================================================================== --- trunk/update/src/modules/Update.ycp (original) +++ trunk/update/src/modules/Update.ycp Fri May 18 17:26:10 2007 @@ -443,7 +443,11 @@ */ global define void fill_version_map (map <string, any>& data) { - data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?"; + if (data["name"]:"?" == "?" && data["version"]:"?" == "?") { + data["nameandversion"] = "?"; + } else { + data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?"; + } list <string> tmp0 = []; if (regexpmatch (data["version"]:"", " -")) { @@ -532,6 +536,7 @@ // get new product name integer num = size (Packages::theSources); + if (num <= 0) { y2error ("No source"); @@ -541,8 +546,35 @@ return false; } - map new_product = Pkg::SourceProductData (Packages::theSources[num-1]:0); - y2milestone ("First source product %1", new_product); + integer update_to_source = nil; + + // So-called System Update + if (Stage::normal()) { + foreach (integer source_id, Packages::theSources, { + map source_map = Pkg::SourceProductData(source_id); + + // source need to be described + if (source_map != $[]) { + if (source_map["productversion"]:"A" == installedVersion["version"]:"B") { + y2milestone ("Found matching product: %1", source_map); + // first valid product is selected + if (update_to_source == nil) + update_to_source = source_id; + } else { + y2error ("Found non-matching product: %1", source_map); + // every invalid product is selected + update_to_source = source_id; + } + } + }); + } + + // a fallback for Stage::normal(), default for !Stage::normal() + if (update_to_source == nil) update_to_source = Packages::theSources[num-1]:0; + + map new_product = Pkg::SourceProductData (update_to_source); + y2milestone ("Product to update to: %1 %2", update_to_source, new_product); + if (new_product == nil) { updateVersion["name"] = "?"; @@ -556,7 +588,12 @@ updateVersion["show"] = new_product["label"]:nil; if (updateVersion["show"]:nil == nil) { y2warning ("No \"label\" defined in product"); - updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + + if (new_product["productname"]:"?" == "?" && new_product["productversion"]:"?" == "?") { + updateVersion["show"] = "?"; + } else { + updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + } } updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; updateVersion["version"] = new_product["productversion"]:"?"; -- 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] r38043 - /trunk/packager/src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:24:58 2007 New Revision: 38043 URL: http://svn.opensuse.org/viewcvs/yast?rev=38043&view=rev Log: Removing unnecessary milestone... Modified: trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Fri May 18 17:24:58 2007 @@ -66,8 +66,6 @@ lang_names_orig = $[]; } - y2milestone ("L: %1", lang_names_orig); - map<string,string> lang_names = $[]; // $[ "en" : "English (US)", "de" : "Deutsch" ] -- 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] r38042 - /branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 18 May '07

18 May '07

Author: lslezak Date: Fri May 18 17:17:46 2007 New Revision: 38042 URL: http://svn.opensuse.org/viewcvs/yast?rev=38042&view=rev Log: - sign also add-ons and YUM sources Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/Pr… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Fri May 18 17:17:46 2007 @@ -1600,6 +1600,42 @@ return ret; } +global boolean SignSUSEtagsSource(string gpg_key, string dir, string passphrase) +{ + // export the key + boolean success = ExportPublicKey(gpg_key, dir); + // update SHA1 sums + success = success && UpdateContentFile(dir, "suse/setup/descr"); + + if (!success) + { + return false; + } + + // sign the source + success = SignSourceFiles(gpg_key, dir, passphrase); + + if (success) + { + // update directory.yast file + string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(dir)); + y2milestone("Updating %1/directory.yast ...", dir); + integer updated = (integer)SCR::Execute(.target.bash, command); + y2milestone("Updated: %1", updated == 0); + success = success && updated == 0; + } + + return success; +} + +global boolean SignYUMSource(string gpg_key, string dir, string passphrase) +{ + boolean ret = GPG::SignAsciiDetached(gpg_key, dir + "/repodata/repomd.xml", passphrase); + ret = ret && GPG::ExportAsciiPublicKey(gpg_key, dir + "/repodata/repomd.xml.key"); + + return ret; +} + global boolean SignSourceStep() { boolean success = true; @@ -1607,48 +1643,55 @@ // sign the files string gpg_key = Config["gpg_key"]:""; - // TODO FIXME sign correctly YUM sources - if (gpg_key != "") { - boolean signed = false; + string passphrase = (Mode::commandline()) ? gpg_passphrase : GPGWidgets::AskPassphrasePopup(gpg_key); - while (!signed) + // not aborted + if (passphrase != nil) { - string passphrase = (Mode::commandline()) ? gpg_passphrase : GPGWidgets::AskPassphrasePopup(gpg_key); - - if (passphrase == nil) - { - // aborted - break; - } - - // export the key - success = success && ExportPublicKey(gpg_key, skel_root); - // update SHA1 sums - success = success && UpdateContentFile(skel_root, "suse/setup/descr"); - // sign the source - signed = SignSourceFiles(gpg_key, skel_root, passphrase); + // sign each product + foreach(integer srcid, string dir, product_map, { + boolean signed = false; + map general_info = Pkg::SourceGeneralData(srcid); + + while (!signed) + { + if (general_info["type"]:"" == "YaST") + { + // sign the source + signed = SignSUSEtagsSource(gpg_key, skel_root + "/" + dir, passphrase); + } + else + { + // sign the source + signed = SignYUMSource(gpg_key, skel_root + "/" + dir, passphrase); + } - // yes/no popup: error message - if (!signed && !Popup::YesNo(_("Error: Could not digitally sign the source.\nTry it again?"))) - { - break; - } + // yes/no popup: error message + if (!signed) + { + if (Popup::YesNo(_("Error: Could not digitally sign the source.\nTry it again?"))) + { + passphrase = (Mode::commandline()) ? gpg_passphrase : GPGWidgets::AskPassphrasePopup(gpg_key); + } + else + { + break; + } + } + } - if (signed) - { - // update directory.yast file - string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(skel_root)); - y2milestone("Updating %1/directory.yast ...", skel_root); - integer updated = (integer)SCR::Execute(.target.bash, command); - y2milestone("Updated: %1", updated == 0); - success = success && updated == 0; - } + success = success && signed; + } + ); + } + else + { + success = false; } - success = success && signed; - + // insert the key into the installation initrd success = success && InsertKeyToInitrds(gpg_key, skel_root); } -- 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] r38041 - in /trunk/update: VERSION package/yast2-update.changes src/config/update.desktop
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 13:50:32 2007 New Revision: 38041 URL: http://svn.opensuse.org/viewcvs/yast?rev=38041&view=rev Log: System Update renamed to FACTORY Update 2.15.12 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/config/update.desktop Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=38041&r1=3804… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Fri May 18 13:50:32 2007 @@ -1 +1 @@ -2.15.11 +2.15.12 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Fri May 18 13:50:32 2007 @@ -6,7 +6,8 @@ are matching (can have a different name). - Warning is printed when versions match but product names are different (#274064). -- System Update temporarily renamed. +- System Update temporarily renamed to 'FACTORY Update'. +- 2.15.12 ------------------------------------------------------------------- Thu May 3 15:51:10 CEST 2007 - lslezak(a)suse.cz Modified: trunk/update/src/config/update.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/config/update.desktop… ============================================================================== --- trunk/update/src/config/update.desktop (original) +++ trunk/update/src/config/update.desktop Fri May 18 13:50:32 2007 @@ -19,6 +19,7 @@ Icon=yast-update Exec=/sbin/yast2 update -Name=Update to Newest Packages -GenericName=Update your system to the newest package versions +Name=FACTORY Update +GenericName=Update your system to the newest packages from FACTORY (expert tool) +Comment=Update your system to the newest packages from FACTORY (expert tool) X-KDE-SubstituteUID=true -- 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] r38040 - /tags/stable-2_15_6/firewall/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 13:33:54 2007 New Revision: 38040 URL: http://svn.opensuse.org/viewcvs/yast?rev=38040&view=rev Log: Created tag stable-2_15_6 for firewall Added: tags/stable-2_15_6/firewall/ - copied from r38039, trunk/firewall/ -- 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] r38039 - /trunk/firewall/src/firewall_proposal.ycp
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 13:33:13 2007 New Revision: 38039 URL: http://svn.opensuse.org/viewcvs/yast?rev=38039&view=rev Log: Suppor for both the old and the new way how to enable SSH during installation. Modified: trunk/firewall/src/firewall_proposal.ycp Modified: trunk/firewall/src/firewall_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/firewall_proposal.y… ============================================================================== --- trunk/firewall/src/firewall_proposal.ycp (original) +++ trunk/firewall/src/firewall_proposal.ycp Fri May 18 13:33:13 2007 @@ -125,7 +125,15 @@ // Enable SSH service } else if (chosen_id == "firewall--enable_ssh_in_proposal") { y2milestone("SSH enabled by a single-click"); - SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:sshd"); + + if (SuSEFirewallServices::IsKnownService("service:sshd")) { + y2milestone ("Service 'service:sshd' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:sshd"); + } else if (SuSEFirewallServices::IsKnownService("ssh")) { + y2warning ("Only service 'ssh' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh"); + } + ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0