February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67380 - /trunk/ncurses/src/NCRichText.h
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 13:27:40 2012 New Revision: 67380 URL: http://svn.opensuse.org/viewcvs/yast?rev=67380&view=rev Log: add AdjustPrePad Modified: trunk/ncurses/src/NCRichText.h Modified: trunk/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.h?rev=673… ============================================================================== --- trunk/ncurses/src/NCRichText.h (original) +++ trunk/ncurses/src/NCRichText.h Wed Feb 8 13:27:40 2012 @@ -212,6 +212,7 @@ void PadWS( const bool tab = false ); void PadTXT( const wchar_t * sch, const unsigned len ); void PadPreTXT( const wchar_t * sch, const unsigned len ); + void AdjustPrePad( const wchar_t * sch ); bool PadTOKEN( const wchar_t * sch, const wchar_t *& ech ); protected: -- 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] r67379 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 13:26:38 2012 New Revision: 67379 URL: http://svn.opensuse.org/viewcvs/yast?rev=67379&view=rev Log: improve adjusting of pad size or text in <pre> tags Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Wed Feb 8 13:26:38 2012 @@ -347,22 +347,13 @@ void NCRichText::PadPreTXT( const wchar_t * osch, const unsigned olen ) { wstring wtxt( osch, olen ); - + // resolve the entities even in PRE (#71718) wtxt = filterEntities( wtxt ); NCstring nctxt( wtxt ); NCtext ftext( nctxt ); - int len = textWidth( wtxt ); - - if ( cc + len > textwidth ) - { - textwidth = cc + len; - AdjustPad( wsze(cl + ftext.Lines(), textwidth) ); - yuiDebug() << "Adjust: " << cl+ftext.Lines() << " " << textwidth << endl; - } - // insert the text const wchar_t * sch = wtxt.data(); @@ -370,9 +361,6 @@ { myPad()->addwstr( sch, 1 ); // add one wide chararacter - if ( iswprint( *sch ) ) - cc += wcwidth( *sch ); // wcwidth for \t returns -1 - ++sch; } } @@ -432,7 +420,74 @@ } +void NCRichText::AdjustPrePad( const wchar_t *osch ) +{ + const wchar_t * wch = osch; + wstring wstr( wch, 6 ); + + size_t llen = 0; // longest line + size_t tmp_len = 0; // width of current line + + list<NCstring>::const_iterator line; // iterator for list <NCstring> mtext + std::wstring::const_iterator wstr_it; // iterator for wstring + + do + { + ++wch; + wstr.assign( wch, 6 ); + } + while ( *wch && wstr != L"</pre>" ); + + wstring wtxt( osch, wch - osch ); + + // resolve the entities to get correct length for calculation of longest line + wtxt = filterEntities( wtxt ); + + wstring to_repl = L"<br>"; + size_t pos; + + // replace <br> by \n to get appropriate lines in NCtext + for ( ; (pos = wtxt.find( to_repl )) != wstring::npos ; ) + wtxt.replace( pos, to_repl.length(), L"\n" ); + + yuiDebug() << "Input: " << wtxt << " olen: " << wch - osch << endl; + + NCstring nctxt( wtxt ); + NCtext ftext( nctxt ); + + // iterate through NCtext + for ( line = ftext.Text().begin(); line != ftext.Text().end(); ++line ) + { + tmp_len = 0; + + for ( wstr_it = ( *line ).str().begin(); wstr_it != ( *line ).str().end() ; ++wstr_it ) + { + // skip html tags + if ( *wstr_it == '<' ) + { + wstr_it = find(wstr_it, (*line).str().end(), L'>'); + } + else if ( *wstr_it == '\t' ) + { + tmp_len += myPad()->tabsize(); + } + else + { + tmp_len += wcwidth( *wstr_it ); + } + } + + if ( tmp_len > llen ) + llen = tmp_len; + } + if ( llen > textwidth ) + { + textwidth = llen; + AdjustPad( wsze( cl + ftext.Lines(), llen ) ); // adjust pad to longest line + } + +} void NCRichText::DrawHTMLPad() { @@ -470,20 +525,15 @@ { switch ( *wch ) { - case L' ': // add white space + case L' ': // add white space + case L'\t': myPad()->addwstr( wch, 1 ); - cc+=wcwidth( *wch ); break; case L'\n': PadNL(); // add new line break; - case L'\t': // add tab - myPad()->addwstr( wch, 1 ); - cc += myPad()->tabsize(); - break; - default: yuiDebug() << "Ignoring " << *wch << endl; } @@ -996,11 +1046,11 @@ if ( !endtag ) { preTag = true; // display text preserving newlines and spaces + AdjustPrePad( sch ); } else { preTag = false; - PadNL(); // add new line after pre } 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] r67378 - /tags/stable-2_21_3/nfs-client/
by mfilka＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: mfilka Date: Wed Feb 8 13:11:04 2012 New Revision: 67378 URL: http://svn.opensuse.org/viewcvs/yast?rev=67378&view=rev Log: Created tag stable-2_21_3 for nfs-client Added: tags/stable-2_21_3/nfs-client/ (props changed) - copied from r67377, trunk/nfs-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] r67377 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/ui.ycp
by mfilka＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: mfilka Date: Wed Feb 8 13:03:57 2012 New Revision: 67377 URL: http://svn.opensuse.org/viewcvs/yast?rev=67377&view=rev Log: Base server hostname combobox on existing values - bnc#547983 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67377&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Wed Feb 8 13:03:57 2012 @@ -1 +1 @@ -2.21.2 +2.21.3 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 Wed Feb 8 13:03:57 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 8 12:00:10 UTC 2012 - mfilka(a)suse.com + +- Base server hostname combobox on existing values - bnc#547983 + +------------------------------------------------------------------- Wed Dec 7 10:05:12 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67377&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Wed Feb 8 13:03:57 2012 @@ -58,6 +58,11 @@ list<string> hosts = nil; /** + * List of already defined nfs mount points + */ + list< map <string,any> > nfs_entries = Nfs::nfs_entries; + + /** * Let the user choose one of a list of items * @param title selectionbox title * @param items a list of items @@ -178,6 +183,7 @@ `Bottom (button) ); } + /** * Ask user for an entry. * @param fstab_ent $["spec": "file": "mntops":] or nil @@ -213,6 +219,21 @@ servers = [ proposed_server ]; } + // append already defined servers - bug #547983 + foreach( map nfs_entry, nfs_entries, + { + term couple = SpecToServPath( nfs_entry[ "spec"]:""); + string known_server = ""; + + known_server = couple[0]:""; + + if( !contains( servers, known_server)) + servers = add( servers, known_server); + }); + + servers = sort( servers); + // + UI::OpenDialog( `opt(`decorated), `HBox( @@ -232,7 +253,8 @@ ), `HSpacing(0.5), TextAndButton ( - `TextEntry(`id(`pathent), + `InputField( `id(`pathent), + `opt(`hstretch), // textentry label _("&Remote Directory"), pth), // pushbutton label, @@ -245,7 +267,8 @@ `Left( `CheckBox(`id(`nfs4), _("NFS&v4 Share"), nfs4)), `Left( TextAndButton ( - `TextEntry(`id(`mountent), + `InputField(`id(`mountent), + `opt(`hstretch), // textentry label _("&Mount Point (local)"), mount), // button label @@ -256,7 +279,7 @@ ), // textentry label `VSpacing(0.2), - `TextEntry(`id(`optionsent), _("O&ptions"), options), + `InputField(`id(`optionsent), `opt( `hstretch), _("O&ptions"), options), `VSpacing(0.2), `ButtonBox( `PushButton(`id(`ok), `opt(`default, `key_F10), Label::OKButton()), @@ -468,7 +491,6 @@ ]; map<string,any> fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings); - list< map <string,any> > nfs_entries = Nfs::nfs_entries; map <string, any> modify_line = $[]; // Help, part 1 of 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] r67376 - /tags/stable-2_22_2/installation/
by tgoettlicher＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: tgoettlicher Date: Tue Feb 7 17:27:01 2012 New Revision: 67376 URL: http://svn.opensuse.org/viewcvs/yast?rev=67376&view=rev Log: Created tag stable-2_22_2 for installation Added: tags/stable-2_22_2/installation/ - copied from r67375, 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] r67375 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call startup/YaST2.ssh
by tgoettlicher＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: tgoettlicher Date: Tue Feb 7 17:25:24 2012 New Revision: 67375 URL: http://svn.opensuse.org/viewcvs/yast?rev=67375&view=rev Log: - Fixed bnc #742777: ssh installation needs to much bandwidth - 2.22.2 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call trunk/installation/startup/YaST2.ssh Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=67375&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Feb 7 17:25:24 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 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 Feb 7 17:25:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 7 17:22:46 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc #742777: ssh installation needs to much bandwidth +- 2.22.2 + +------------------------------------------------------------------- Fri Jan 13 11:02:40 CET 2012 - jsuchome(a)suse.cz - confirmed license Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Tue Feb 7 17:25:24 2012 @@ -147,6 +147,7 @@ # --- # : + export Y2STYLE="installation_slim" } #----[ prepare_for_vnc ]----# @@ -155,6 +156,7 @@ # prepare VNC installation # --- # + export Y2STYLE="installation_slim" #============================================= # Setup splash screen #--------------------------------------------- Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?r… ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Tue Feb 7 17:25:24 2012 @@ -59,6 +59,8 @@ #---------------------------------------- if [ -f /var/lib/YaST2/runme_at_boot ];then + export Y2STYLE="installation_slim" + # running the second stage installation /usr/lib/YaST2/startup/YaST2.call installation continue -- 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] r67374 - /tags/branch-Code-11-SP2-2_17_14/http-server/
by locilka＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: locilka Date: Tue Feb 7 16:08:02 2012 New Revision: 67374 URL: http://svn.opensuse.org/viewcvs/yast?rev=67374&view=rev Log: Created tag branch-Code-11-SP2-2_17_14 for http-server Added: tags/branch-Code-11-SP2-2_17_14/http-server/ (props changed) - copied from r67373, branches/SuSE-Code-11-SP2-Branch/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] r67373 - in /branches/SuSE-Code-11-SP1-Branch/http-server: VERSION package/yast2-http-server.changes src/YaPI/HTTPD.pm src/http-server.desktop
by locilka＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: locilka Date: Tue Feb 7 11:55:37 2012 New Revision: 67373 URL: http://svn.opensuse.org/viewcvs/yast?rev=67373&view=rev Log: Getting SP1 into the same state as SP2 - not wanted to maintain more than one version in SLE 11 - Especially fixed bug with NameVirtualHost (bnc#486475) Modified: branches/SuSE-Code-11-SP1-Branch/http-server/VERSION branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop Modified: branches/SuSE-Code-11-SP1-Branch/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/VERSION Tue Feb 7 11:55:37 2012 @@ -1 +1 @@ -2.17.11 +2.17.14 Modified: branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes Tue Feb 7 11:55:37 2012 @@ -1,7 +1,20 @@ ------------------------------------------------------------------- +Tue Feb 7 11:45:02 UTC 2012 - locilka(a)suse.cz + +- Backported a real fix for NameVirtualHost from trunk (bnc#486475) +- 2.17.14 + +------------------------------------------------------------------- +Thu Dec 22 09:39:32 UTC 2011 - jsrain(a)suse.cz + +- removed superfluous spaces from .desktop-file (bnc#712052) +- 2.17.13 + +------------------------------------------------------------------- Fri Feb 25 13:53:54 CET 2011 - jsrain(a)suse.cz - fixed server flags handling (bnc#656589) +- 2.17.12 ------------------------------------------------------------------- Wed Mar 25 14:06:28 CET 2009 - mzugec(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm Tue Feb 7 11:55:37 2012 @@ -538,6 +538,7 @@ # $vhost_files->{$ip} = @newdata; # } + $self->validateNVH(); } @@ -588,29 +589,28 @@ # push(@newdata, $row); # } # } -my $params = $self->getVhType($hostid); - - $self->deleteVH($hostid); - $self->createVH($hostid, $data, $params); - $self->validateNVH(); + my $params = $self->getVhType($hostid); + $self->deleteVH($hostid); + $self->createVH($hostid, $data, $params); } sub validateNVH (){ - my @nb = (); + my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ - push(@nb, $key); + my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; + $nb{$host_ip}=1; } } + my @tmp_data=(); foreach my $row (@{$vhost_files->{main}{DATA}}){ - push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); + push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); } $vhost_files->{main}{DATA} = \@tmp_data; - - foreach my $ip (@nb){ + foreach my $ip (keys %nb){ push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); } Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop Tue Feb 7 11:55:37 2012 @@ -16,7 +16,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=http-server X-SuSE-YaST-AutoInstClonable=true -X-SuSE-YaST-AutoInstSchema = http-server.rnc +X-SuSE-YaST-AutoInstSchema=http-server.rnc Icon=yast-http-server Exec=/sbin/yast2 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] r67372 - in /branches/SuSE-Code-11-SP2-Branch/http-server: VERSION package/yast2-http-server.changes src/YaPI/HTTPD.pm
by locilka＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: locilka Date: Tue Feb 7 11:53:41 2012 New Revision: 67372 URL: http://svn.opensuse.org/viewcvs/yast?rev=67372&view=rev Log: - Backported a real fix for NameVirtualHost from trunk (bnc#486475) - 2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/http-server/VERSION branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm Modified: branches/SuSE-Code-11-SP2-Branch/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/http-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/http-server/VERSION Tue Feb 7 11:53:41 2012 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes Tue Feb 7 11:53:41 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 7 11:45:02 UTC 2012 - locilka(a)suse.cz + +- Backported a real fix for NameVirtualHost from trunk (bnc#486475) +- 2.17.14 + +------------------------------------------------------------------- Thu Dec 22 09:39:32 UTC 2011 - jsrain(a)suse.cz - removed superfluous spaces from .desktop-file (bnc#712052) Modified: branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm Tue Feb 7 11:53:41 2012 @@ -538,6 +538,7 @@ # $vhost_files->{$ip} = @newdata; # } + $self->validateNVH(); } @@ -588,29 +589,28 @@ # push(@newdata, $row); # } # } -my $params = $self->getVhType($hostid); - - $self->deleteVH($hostid); - $self->createVH($hostid, $data, $params); - $self->validateNVH(); + my $params = $self->getVhType($hostid); + $self->deleteVH($hostid); + $self->createVH($hostid, $data, $params); } sub validateNVH (){ - my @nb = (); + my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ - push(@nb, $key); + my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; + $nb{$host_ip}=1; } } + my @tmp_data=(); foreach my $row (@{$vhost_files->{main}{DATA}}){ - push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); + push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); } $vhost_files->{main}{DATA} = \@tmp_data; - - foreach my $ip (@nb){ + foreach my $ip (keys %nb){ push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$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] r67371 - in /trunk/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: fehr Date: Mon Feb 6 14:35:49 2012 New Revision: 67371 URL: http://svn.opensuse.org/viewcvs/yast?rev=67371&view=rev Log: change detection of qla iscsi devices (bnc#745201) Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Mon Feb 6 14:35:49 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 6 14:05:22 CET 2012 - fehr(a)suse.de + +- change detection of qla iscsi devices (bnc#745201) + +------------------------------------------------------------------- Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de - call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Mon Feb 6 14:35:49 2012 @@ -651,7 +651,7 @@ [ "bnx2", "bnx2/bnx2i/bnx2x", [ "bnx2", "bnx2i", "bnx2x" ], [ "bnx2i" ] ], [ "cxgb3", "cxgb3/cxgb3i", [ "cxgb3", "cxgb3i" ], [ "cxgb3i" ] ], [ "enic", "enic/cnic/fnic", [ "enic", "fnic" ], [ "fnic" ] ], - [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx" ], [ "qla4xxx" ] ], + [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx", "qlcnic" ], [ "qla4xxx" ] ], [ "be2net", "be2net/be2iscsi", [ "be2net", "be2iscsi" ], [ "be2iscsi"] ] ]; @@ -698,11 +698,12 @@ y2milestone( "GetOffloadItems card:%1", c ); list<list> tmp = maplist( map m, c["drivers"]:[], ``(flatten((list<list>)m["modules"]:[]))); - return( $["modules":maplist( list ml, tmp, ``(ml[0]:"")), + map r = $["modules":maplist( list ml, tmp, ``(ml[0]:"")), "iface":c["dev_name"]:"", - "macaddr":c["resource","hwaddr",0,"addr"]:""]); + "macaddr":c["resource","hwaddr",0,"addr"]:""]; + y2milestone( "GetOffloadItems cinf:%1", r ); + return( r ); }); - y2milestone( "GetOffloadItems hw_mods:%1", hw_mods ); integer idx = 0; foreach( list<any> l, offload, ``{ @@ -714,8 +715,12 @@ foreach( map hw, hw_mods, ``{ if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) + { + y2milestone( "GetOffloadItems l:%1", l ); + y2milestone( "GetOffloadItems valid:%1", hw ); offload_valid[idx] = add( offload_valid[idx]:[], [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+l[3,0]:""] ); + } }); } idx = idx+1; @@ -729,7 +734,8 @@ cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:.."; y2milestone( "GetOffloadItems cmd:%1", cmd ); map out = (map) SCR::Execute (.target.bash_output, cmd ); - y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); + y2milestone( "GetOffloadItems iscsi_offload out:%1", + SCR::Execute (.target.bash_output, offboard_script + " " + l[0]:"" )); offload_res[l[0]:""] = $[]; offload_res[l[0]:"","exit"] = out["exit"]:1; list<string> sl = []; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0