April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67934 - /trunk/bootloader/src/clients/bootloader_finish.ycp
by aschnell＠svn2.opensuse.org 13 Apr '12

13 Apr '12

Author: aschnell Date: Fri Apr 13 15:36:57 2012 New Revision: 67934 URL: http://svn.opensuse.org/viewcvs/yast?rev=67934&view=rev Log: - adapted ssh command for 2nd stage ssh installation (bnc#745340) Modified: trunk/bootloader/src/clients/bootloader_finish.ycp Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Fri Apr 13 15:36:57 2012 @@ -151,9 +151,9 @@ // and we're ready to start (boot into) the installed system // Message that will be displayed along with information // how the boot loader was installed - Misc::boot_msg = _("The system will reboot now. + Misc::boot_msg = sformat(_("The system will reboot now. After reboot, reconnect and run the following: -/usr/lib/YaST2/startup/YaST2.ssh"); +%1"), "yast.ssh"); else // Final message after all packages from CD1 are installed // and we're ready to start (boot into) the installed 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] r67933 - in /trunk/x11: ./ Makefile.am
by aschnell＠svn2.opensuse.org 13 Apr '12

13 Apr '12

Author: aschnell Date: Fri Apr 13 12:22:34 2012 New Revision: 67933 URL: http://svn.opensuse.org/viewcvs/yast?rev=67933&view=rev Log: - removed generated file Removed: trunk/x11/Makefile.am Modified: trunk/x11/ (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] r67932 - /trunk/core/libycp/src/YCPBuiltinString.cc
by aschnell＠svn2.opensuse.org 13 Apr '12

13 Apr '12

Author: aschnell Date: Fri Apr 13 11:56:11 2012 New Revision: 67932 URL: http://svn.opensuse.org/viewcvs/yast?rev=67932&view=rev Log: - fixed documentation Modified: trunk/core/libycp/src/YCPBuiltinString.cc Modified: trunk/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinString… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinString.cc (original) +++ trunk/core/libycp/src/YCPBuiltinString.cc Fri Apr 13 11:56:11 2012 @@ -544,7 +544,8 @@ * * @description * Returns string with all alphabetic characters converted to lowercase. - * Notice: national characters are left unchanged. + * Notice: national characters are left unchanged. Use when working with + * e.g. options in config files. * * @usage tolower ("aBcDeF") -> "abcdef" * @usage tolower ("ABCÃÃÃÄ") -> "abcÃÃÃÄ" @@ -567,12 +568,13 @@ * @builtin toupper * @short Makes a string uppercase * - * @description + * @description * Returns string with all alphabetic characters converted to - * uppercase. - + * uppercase. Notice: national characters are left unchanged. Use when + * working with e.g. options in config files. + * * @see toupper - * @usage tolower ("aBcDeF") -> "ABCDEF" + * @usage toupper ("aBcDeF") -> "ABCDEF" * @usage toupper ("abcÃ¡Ã¤Ã¶Ä") -> "ABCÃ¡Ã¤Ã¶Ä" */ -- 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] r67931 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src: IscsiLioData.ycp widgets.ycp
by fehr＠svn2.opensuse.org 12 Apr '12

12 Apr '12

Author: fehr Date: Thu Apr 12 18:46:50 2012 New Revision: 67931 URL: http://svn.opensuse.org/viewcvs/yast?rev=67931&view=rev Log: checkin for backup purposes Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/IscsiLioData.ycp Thu Apr 12 18:46:50 2012 @@ -920,6 +920,22 @@ return( ret ); } +global boolean DoRemoveClnt( string tgt, integer tpg, string clnt ) + { + string kt = tgt + " " + tpg + " " + clnt; + boolean ret = LogExecCmd( "lio_node --delnodeacl " + kt ); + y2milestone( "DoRemoveClnt tgt:%1 tpg:%2 clnt:%3 ret:%4", tgt, tpg, clnt, ret ); + return( ret ); + } + +global boolean DoCreateClnt( string tgt, integer tpg, string clnt ) + { + string kt = tgt + " " + tpg + " " + clnt; + boolean ret = LogExecCmd( "lio_node --addnodeacl " + kt ); + y2milestone( "DoCreateClnt tgt:%1 tpg:%2 clnt:%3 ret:%4", tgt, tpg, clnt, ret ); + return( ret ); + } + global void UpdateConfig() { data = ParseConfigLio(); Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-lio-server/src/widgets.ycp Thu Apr 12 18:46:50 2012 @@ -521,6 +521,93 @@ return lmap; } +map AddClntDialog() + { + y2milestone( "AddClntDialog" ); + map ret = $[]; + term dlg = `VBox( `MarginBox( 4, 1, + `VBox( + `Left(`Label(_("New client name:"))), + `MinWidth( 50, `InputField(`id(`clnt), `opt(`hstretch), "", "")), + `VSpacing(0.5), + `Left(`CheckBox( `id(`import), _("Import LUNs from TPG"), true )))), + `ButtonBox( + `PushButton(`id(`ok), `opt(`default), Label::OKButton() ), + `PushButton(`id(`cancel), Label::CancelButton() ))); + UI::OpenDialog(dlg); + symbol sym = `nil; + while(sym != `ok && sym !=`cancel) + { + sym = (symbol)UI::UserInput(); + y2milestone( "AddClntDialog sym:%1", sym ); + if(sym == `ok) + { + string txt = ""; + string s = (string)UI::QueryWidget(`id(`clnt), `Value); + if( isempty(s) ) + txt = _("Client name must not be empty!"); + if( haskey( changed_lun, s ) || + contains( IscsiLioData::GetClntList(curr_target, curr_tpg), s )) + txt = _("Client name already exists!"); + if( !isempty(txt)) + { + sym = `again; + UI::SetFocus(`id(`clnt)); + Popup::Error( txt ); + } + else + { + ret["clnt"] = s; + ret["import"] = (boolean)UI::QueryWidget(`id(`import), `Value); + } + } + } + UI::CloseDialog(); + y2milestone( "AddClntDialog ret:%1", ret ); + return ret; + } + +string CopyClntDialog() + { + y2milestone( "CopylntDialog" ); + string ret = ""; + term dlg = `VBox( `MarginBox( 4, 1, + `VBox( + `Left(`Label(_("New client name:"))), + `MinWidth( 50, `InputField(`id(`clnt), `opt(`hstretch), "", "")))), + `ButtonBox( + `PushButton(`id(`ok), `opt(`default), Label::OKButton() ), + `PushButton(`id(`cancel), Label::CancelButton() ))); + UI::OpenDialog(dlg); + symbol sym = `nil; + while(sym != `ok && sym !=`cancel) + { + sym = (symbol)UI::UserInput(); + y2milestone( "CopyClntDialog sym:%1", sym ); + if(sym == `ok) + { + string txt = ""; + string s = (string)UI::QueryWidget(`id(`clnt), `Value); + if( isempty(s) ) + txt = _("Client name must not be empty!"); + if( haskey( changed_lun, s ) || + contains( IscsiLioData::GetClntList(curr_target, curr_tpg), s )) + txt = _("Client name already exists!"); + if( !isempty(txt)) + { + sym = `again; + UI::SetFocus(`id(`clnt)); + Popup::Error( txt ); + } + else + ret = s; + } + } + UI::CloseDialog(); + y2milestone( "CopyClntDialog ret:%1", ret ); + return ret; + } + // dialog to add/modify user and password list <string> getDialogValues(string user, string pass){ UI::OpenDialog( `VBox( @@ -982,8 +1069,6 @@ map m = IscsiLioData::GetAuth( curr_target, curr_tpg, s ); auth = GetAuthString(m); } - string lun = ""; - map<integer,integer> lmap = IscsiLioData::GetClntLun( curr_target, curr_tpg, s ); string luns = GetLunList( IscsiLioData::GetClntLun( curr_target, curr_tpg, s ) ); inc_items = add( inc_items, `item(`id(size(inc_items)), s, luns, auth)); }); @@ -997,6 +1082,7 @@ switch((symbol)event["WidgetID"]:nil) { case `delete: + { any del = (integer)UI::QueryWidget(`id (`clnt_table),`CurrentItem); if (del != nil) { @@ -1005,16 +1091,20 @@ y2milestone("handleClient Delete Client %1 from table", del); list<term> it=(list<term>)UI::QueryWidget(`clnt_table, `Items); string clnt = GetById(it,del)[1]:""; - del_clnt = add( del_clnt, clnt ); + if( !contains( del_clnt, clnt )) + del_clnt = add( del_clnt, clnt ); + y2milestone( "handleClient del_clnt:%1", del_clnt ); if( haskey(changed_lun,clnt)) changed_lun = remove(changed_lun,clnt); - y2milestone( "handleClient del_clnt:%1", del_clnt ); + if( haskey(changed_auth,clnt)) + changed_auth = remove(changed_auth,clnt); it = RemoveById( it, del ); UI::ChangeWidget(`id(`clnt_table), `Items, it); } else y2milestone("handleClient: Delete canceled"); } + } break; case `edit_lun: { @@ -1053,16 +1143,58 @@ } break; case `add: - /* - items = (list<term>)UI::QueryWidget(`clnt_table, `Items); - ret = LUNDetailDialog( -1, items ); - if( ret!=`Empty() ) + { + map ret = AddClntDialog(); + if( !isempty(ret) && !isempty(ret["clnt"]:"") ) { - items = (list<term>)add( items, ret ); + list<term> items = (list<term>)UI::QueryWidget(`clnt_table, `Items); + string auth = _("Disabled"); + string c = ret["clnt"]:""; + if( IscsiLioData::GetTpgAuth( curr_target, curr_tpg ) ) + { + auth = GetAuthString( $[] ); + changed_auth[c] = $[]; + } + map<integer,integer> lmap = $[]; + if( ret["import"]:false ) + lmap = mapmap( integer l, map m, + IscsiLioData::GetLun( curr_target, curr_tpg ), + ``($[l:l])); + y2milestone( "handleClient clnt:%1 lmap:%2", c, lmap ); + changed_lun[c] = lmap; + term it = `item(`id(size(items)), c, GetLunList( lmap ), auth); + items = (list<term>)add( items, it ); + UI::ChangeWidget(`clnt_table, `Items, items); + UI::ChangeWidget(`clnt_table, `CurrentItem, size(items)-1); + } + } + break; + case `copy: + { + integer edit_pos=tointeger(UI::QueryWidget(`clnt_table, `CurrentItem)); + list<term> items = (list<term>)UI::QueryWidget(`clnt_table, `Items); + term it = items[edit_pos]:`Empty(); + string s = it[1]:""; + y2milestone( "handleClient pos:%1 clnt:%2", edit_pos, s ); + string c = CopyClntDialog(); + if( !isempty(c) ) + { + string auth = _("Disabled"); + if( IscsiLioData::GetTpgAuth( curr_target, curr_tpg ) ) + { + map m = IscsiLioData::GetAuth( curr_target, curr_tpg, s ); + auth = GetAuthString(m); + changed_auth[c] = m; + } + map<integer,integer> lmap = IscsiLioData::GetClntLun( curr_target, curr_tpg, s ); + changed_lun[c] = lmap; + y2milestone( "handleClient clnt:%1", c ); + term it = `item(`id(size(items)), c, GetLunList( lmap ), auth); + items = (list<term>)add( items, it ); UI::ChangeWidget(`clnt_table, `Items, items); UI::ChangeWidget(`clnt_table, `CurrentItem, size(items)-1); } - */ + } break; } } @@ -1082,10 +1214,67 @@ void storeClient(string option_id, map option_map) { - list target = uiTarget(); - y2milestone( "storeAddTarget %1", target ); - curr_target = sformat( "%1:%2", target[0]:"", target[1]:"" ); - curr_tpg = target[2]:-1; + boolean chg = false; + //map<string, map<integer,integer> > changed_lun = $[]; + list<string> cl = IscsiLioData::GetClntList( curr_target, curr_tpg ); + foreach( string c, del_clnt, + ``{ + if( contains( cl, c )) + { + chg = true; + if( !IscsiLioData::DoRemoveClnt( curr_target, curr_tpg, c )) + { + string txt = sformat( _("Problem removing client %3 from %1:%2"), + curr_target, curr_tpg, c ); + Popup::Error( txt ); + } + } + }); + del_clnt = []; + foreach( string c, map m, changed_auth, + { + boolean ok = true; + if( !contains( cl, c )) + { + chg = true; + if( !IscsiLioData::DoCreateClnt( curr_target, curr_tpg, c )) + { + string txt = sformat( _("Problem creating client %3 for %1:%2"), + curr_target, curr_tpg, c ); + Popup::Error( txt ); + ok = false; + } + } + if( ok ) + { + map ca = IscsiLioData::GetAuth( curr_target, curr_tpg, c ); + if( isempty(m["incoming"]:[])!=isempty(ca["incoming"]:[]) || + isempty(m["outgoing"]:[])!=isempty(ca["outgoing"]:[]) || + m["incoming",0]:""!=ca["incoming",0]:"" || + m["incoming",1]:""!=ca["incoming",1]:"" || + m["outgoing",0]:""!=ca["outgoing",0]:"" || + m["outgoing",1]:""!=ca["outgoing",1]:"" ) + { + y2milestone( "storeClient auth c:%1", c ); + y2milestone( "storeClient cur:%1 new:%2", ca, m ); + chg = true; + if( !IscsiLioData::SetAuth( curr_target, curr_tpg, c, + m["incoming"]:[], m["outgoing"]:[] )) + { + string txt = sformat( _("Problem changing auth for client %3 in %1:%2"), + curr_target, curr_tpg, c ); + Popup::Error( txt ); + } + } + } + + }); + changed_auth = $[]; + y2milestone( "storeClient chg:%1", chg ); + if( chg ) + { + IscsiLioData::UpdateConfig(); + } } } -- 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] r67930 - /trunk/perl-bindings/src/YPerl.cc
by aschnell＠svn2.opensuse.org 12 Apr '12

12 Apr '12

Author: aschnell Date: Thu Apr 12 17:17:15 2012 New Revision: 67930 URL: http://svn.opensuse.org/viewcvs/yast?rev=67930&view=rev Log: - don't use deprecated YCPMapIterator Modified: trunk/perl-bindings/src/YPerl.cc Modified: trunk/perl-bindings/src/YPerl.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/perl-bindings/src/YPerl.cc?rev=6… ============================================================================== --- trunk/perl-bindings/src/YPerl.cc (original) +++ trunk/perl-bindings/src/YPerl.cc Thu Apr 12 17:17:15 2012 @@ -509,18 +509,18 @@ // Fill hash // - for ( YCPMapIterator it = map->begin(); it != map->end(); ++it ) + for ( YCPMap::const_iterator it = map->begin(); it != map->end(); ++it ) { string keyStr; - if ( it.key()->isString() ) keyStr = it.key()->asString()->value(); - else if ( it.key()->isSymbol() ) keyStr = it.key()->asSymbol()->symbol(); - else if ( it.key()->isInteger() ) keyStr = it.key()->toString(); + if ( it->first->isString() ) keyStr = it->first->asString()->value(); + else if ( it->first->isSymbol() ) keyStr = it->first->asSymbol()->symbol(); + else if ( it->first->isInteger() ) keyStr = it->first->toString(); if ( keyStr.empty() ) { y2error( "Couldn't convert YCP map key '%s' to Perl hash key", - it.key()->toString().c_str() ); + it->first->toString().c_str() ); } else { @@ -528,7 +528,7 @@ // Add one key / value pair // - SV * scalarVal = newPerlScalar( it.value(), true ); + SV * scalarVal = newPerlScalar( it->second, true ); if ( scalarVal ) { @@ -537,7 +537,7 @@ if ( ret == 0 ) { y2error( "Couldn't insert Perl hash value '%s' => '%s'", - keyStr.c_str(), it.value()->toString().c_str() ); + keyStr.c_str(), it->second->toString().c_str() ); SvREFCNT_dec( scalarVal ); // Free scalar (avoid memory leak) } @@ -550,7 +550,7 @@ else { y2error( "Couldn't convert YCP map value '%s' to Perl hash value", - it.value()->toString().c_str() ); + it->second->toString().c_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] r67929 - in /trunk/ycp-ui-bindings/src: YCPDialogParser.cc YCP_UI.cc
by aschnell＠svn2.opensuse.org 12 Apr '12

12 Apr '12

Author: aschnell Date: Thu Apr 12 17:16:53 2012 New Revision: 67929 URL: http://svn.opensuse.org/viewcvs/yast?rev=67929&view=rev Log: - don't use deprecated YCPMapIterator Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc trunk/ycp-ui-bindings/src/YCP_UI.cc Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPDialogPar… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPDialogParser.cc (original) +++ trunk/ycp-ui-bindings/src/YCPDialogParser.cc Thu Apr 12 17:16:53 2012 @@ -3498,8 +3498,8 @@ string pixmap = term->value( argnr )->asString()->value(); map<string,string> zones; YCPMap secondArg = term->value( argnr+1 )->asMap(); - for ( YCPMapIterator it = secondArg.begin(); it != secondArg.end(); ++it ) - zones[ it.key()->asString()->value() ] = it.value()->asString()->value(); + for ( YCPMap::const_iterator it = secondArg.begin(); it != secondArg.end(); ++it ) + zones[ it->first->asString()->value() ] = it->second->asString()->value(); YTimezoneSelector * selector = YUI::optionalWidgetFactory()->createTimezoneSelector( parent, pixmap, zones ); Modified: trunk/ycp-ui-bindings/src/YCP_UI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCP_UI.cc?re… ============================================================================== --- trunk/ycp-ui-bindings/src/YCP_UI.cc (original) +++ trunk/ycp-ui-bindings/src/YCP_UI.cc Thu Apr 12 17:16:53 2012 @@ -1512,12 +1512,12 @@ */ void YCP_UI::SetFunctionKeys( const YCPMap & new_fkeys ) { - for ( YCPMapIterator it = new_fkeys->begin(); it != new_fkeys->end(); ++it ) + for ( YCPMap::const_iterator it = new_fkeys->begin(); it != new_fkeys->end(); ++it ) { - if ( it.key()->isString() && it.value()->isInteger() ) + if ( it->first->isString() && it->second->isInteger() ) { - string label = YShortcut::cleanShortcutString( it.key()->asString()->value() ); - int fkey = it.value()->asInteger()->value(); + string label = YShortcut::cleanShortcutString( it->first->asString()->value() ); + int fkey = it->second->asInteger()->value(); if ( fkey > 0 && fkey <= 24 ) { @@ -1534,7 +1534,7 @@ { ycperror( "SetFunctionKeys(): Invalid map element: " "Expected <string>: <integer>, not %s: %s", - it.key()->toString().c_str(), it.value()->toString().c_str() ); + it->first->toString().c_str(), it->second->toString().c_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] r67928 - in /trunk/dns-server: agents/ag_dns_zone package/yast2-dns-server.changes
by locilka＠svn2.opensuse.org 12 Apr '12

12 Apr '12

Author: locilka Date: Thu Apr 12 14:51:08 2012 New Revision: 67928 URL: http://svn.opensuse.org/viewcvs/yast?rev=67928&view=rev Log: - Fixed zone-file agent to handle semicolons in TXT records correctly instead of considering them to represent comments (bnc#755766). Modified: trunk/dns-server/agents/ag_dns_zone trunk/dns-server/package/yast2-dns-server.changes Modified: trunk/dns-server/agents/ag_dns_zone URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/agents/ag_dns_zone?re… ============================================================================== --- trunk/dns-server/agents/ag_dns_zone (original) +++ trunk/dns-server/agents/ag_dns_zone Thu Apr 12 14:51:08 2012 @@ -261,7 +261,20 @@ { my %rec = (); my $in = ""; my $ttl = ""; - ($rec{"key"}, $ttl, $in, $rec{"type"}, $rec{"value"}) = $line =~ /^([^ \t]*)([ \t]+[0-9a-zA-Z]+)?[ \t]*(IN)?[ \t]+([A-Za-z]+)[ \t]+([^;\n]+).*$/; + $line =~ s/^([^ \t]*)([ \t]+[0-9a-zA-Z]+)?[ \t]*(IN)?[ \t]+([A-Za-z]+)[ \t]+//; + ($rec{"key"}, $ttl, $in, $rec{"type"}, $rec{"value"}) = ($1, $2, $3, $4); + + # BNC #755766 + # TXT records (values) can contain semicolons + if ($rec{"type"} =~ /txt/i) { + $line =~ s/^(\"[^\n]*\")[ \t]*(;.*)?$//; + $rec{"value"} = $1; + $rec{"value"} =~ s/\"[ \t]\"//g; # several texts merged into one + # The other records consider each semicolon to be a comment + } else { + $line =~ s/^([^;\n]+).*$//; + $rec{"value"} = $1; + } # undefined key takes the key from the previous line if (!$rec{"key"}) { Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Thu Apr 12 14:51:08 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Thu Apr 12 12:05:03 CEST 2012 - locilka(a)suse.com + +- Fixed zone-file agent to handle semicolons in TXT records + correctly instead of considering them to represent comments + (bnc#755766). + +------------------------------------------------------------------ Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com - Checking for and adding required LDAP schemas (yast, dnszone) -- 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] r67927 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: agents/ag_dns_zone package/yast2-dns-server.changes
by locilka＠svn2.opensuse.org 12 Apr '12

12 Apr '12

Author: locilka Date: Thu Apr 12 14:50:55 2012 New Revision: 67927 URL: http://svn.opensuse.org/viewcvs/yast?rev=67927&view=rev Log: - Fixed zone-file agent to handle semicolons in TXT records correctly instead of considering them to represent comments (bnc#755766). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/agents/ag_dns_zone branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/agents/ag_dns_zone URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/agents/ag_dns_zone (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/agents/ag_dns_zone Thu Apr 12 14:50:55 2012 @@ -261,7 +261,20 @@ { my %rec = (); my $in = ""; my $ttl = ""; - ($rec{"key"}, $ttl, $in, $rec{"type"}, $rec{"value"}) = $line =~ /^([^ \t]*)([ \t]+[0-9a-zA-Z]+)?[ \t]*(IN)?[ \t]+([A-Za-z]+)[ \t]+([^;\n]+).*$/; + $line =~ s/^([^ \t]*)([ \t]+[0-9a-zA-Z]+)?[ \t]*(IN)?[ \t]+([A-Za-z]+)[ \t]+//; + ($rec{"key"}, $ttl, $in, $rec{"type"}, $rec{"value"}) = ($1, $2, $3, $4); + + # BNC #755766 + # TXT records (values) can contain semicolons + if ($rec{"type"} =~ /txt/i) { + $line =~ s/^(\"[^\n]*\")[ \t]*(;.*)?$//; + $rec{"value"} = $1; + $rec{"value"} =~ s/\"[ \t]\"//g; # several texts merged into one + # The other records consider each semicolon to be a comment + } else { + $line =~ s/^([^;\n]+).*$//; + $rec{"value"} = $1; + } # undefined key takes the key from the previous line if (!$rec{"key"}) { Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Thu Apr 12 14:50:55 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Thu Apr 12 12:05:03 CEST 2012 - locilka(a)suse.com + +- Fixed zone-file agent to handle semicolons in TXT records + correctly instead of considering them to represent comments + (bnc#755766). + +------------------------------------------------------------------ Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com - Checking for and adding required LDAP schemas (yast, dnszone) -- 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] r67926 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: agents/ag_dns_zone package/yast2-dns-server.changes
by locilka＠svn2.opensuse.org 12 Apr '12

12 Apr '12

Author: locilka Date: Thu Apr 12 14:50:33 2012 New Revision: 67926 URL: http://svn.opensuse.org/viewcvs/yast?rev=67926&view=rev Log: - Fixed zone-file agent to handle semicolons in TXT records correctly instead of considering them to represent comments (bnc#755766). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/agents/ag_dns_zone branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/agents/ag_dns_zone URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/agents/ag_dns_zone (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/agents/ag_dns_zone Thu Apr 12 14:50:33 2012 @@ -261,7 +261,20 @@ { my %rec = (); my $in = ""; my $ttl = ""; - ($rec{"key"}, $ttl, $in, $rec{"type"}, $rec{"value"}) = $line =~ /^([^ \t]*)([ \t]+[0-9a-zA-Z]+)?[ \t]*(IN)?[ \t]+([A-Za-z]+)[ \t]+([^;\n]+).*$/; + $line =~ s/^([^ \t]*)([ \t]+[0-9a-zA-Z]+)?[ \t]*(IN)?[ \t]+([A-Za-z]+)[ \t]+//; + ($rec{"key"}, $ttl, $in, $rec{"type"}, $rec{"value"}) = ($1, $2, $3, $4); + + # BNC #755766 + # TXT records (values) can contain semicolons + if ($rec{"type"} =~ /txt/i) { + $line =~ s/^(\"[^\n]*\")[ \t]*(;.*)?$//; + $rec{"value"} = $1; + $rec{"value"} =~ s/\"[ \t]\"//g; # several texts merged into one + # The other records consider each semicolon to be a comment + } else { + $line =~ s/^([^;\n]+).*$//; + $rec{"value"} = $1; + } # undefined key takes the key from the previous line if (!$rec{"key"}) { Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Thu Apr 12 14:50:33 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Thu Apr 12 12:05:03 CEST 2012 - locilka(a)suse.com + +- Fixed zone-file agent to handle semicolons in TXT records + correctly instead of considering them to represent comments + (bnc#755766). + +------------------------------------------------------------------ Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com - Checking for and adding required LDAP schemas (yast, dnszone) -- 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] r67925 - in /trunk/libyui: package/yast2-libyui.changes src/TreeItem.h
by tgoettlicher＠svn2.opensuse.org 12 Apr '12

12 Apr '12

Author: tgoettlicher Date: Thu Apr 12 14:23:44 2012 New Revision: 67925 URL: http://svn.opensuse.org/viewcvs/yast?rev=67925&view=rev Log: Fix build with gcc 4.7. Modified: trunk/libyui/package/yast2-libyui.changes trunk/libyui/src/TreeItem.h Modified: trunk/libyui/package/yast2-libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/package/yast2-libyui.chan… ============================================================================== --- trunk/libyui/package/yast2-libyui.changes (original) +++ trunk/libyui/package/yast2-libyui.changes Thu Apr 12 14:23:44 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Apr 12 14:23:02 CEST 2012 - tgoettlicher(a)suse.de + +- Fix build with gcc 4.7. + +------------------------------------------------------------------- Fri Mar 16 10:56:18 CET 2012 - tgoettlicher(a)suse.de - Fixed bnc#722325: untranslated rpm groups Modified: trunk/libyui/src/TreeItem.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/TreeItem.h?rev=67925&… ============================================================================== --- trunk/libyui/src/TreeItem.h (original) +++ trunk/libyui/src/TreeItem.h Thu Apr 12 14:23:44 2012 @@ -251,7 +251,7 @@ // Insert as first child newChild->setNext( firstChild() ); - setFirstChild( newChild ); + this->setFirstChild( newChild ); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0