March 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r56378 - in /trunk/http-server: VERSION agents/ag_http_server package/yast2-http-server.changes src/YaPI/HTTPD.pm
by mzugec＠svn.opensuse.org 25 Mar '09

25 Mar '09

Author: mzugec Date: Wed Mar 25 09:24:10 2009 New Revision: 56378 URL: http://svn.opensuse.org/viewcvs/yast?rev=56378&view=rev Log: for name-based vhosts split configuration files (bnc#427427) Modified: trunk/http-server/VERSION trunk/http-server/agents/ag_http_server trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/YaPI/HTTPD.pm Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=56378&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Wed Mar 25 09:24:10 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/http-server/agents/ag_http_server URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/agents/ag_http_serve… ============================================================================== --- trunk/http-server/agents/ag_http_server (original) +++ trunk/http-server/agents/ag_http_server Wed Mar 25 09:24:10 2009 @@ -121,15 +121,16 @@ foreach my $vhost ( @$conf ) { if ($file eq 'default-server.conf'){ $hash_table{'main'} = $vhost; -# foreach my $data ( @{$vhost->{'DATA'}} ) -# { if ($data->{'KEY'} eq 'NameVirtualHost'){ $hash_table{ $data->{'VALUE'} } = []; } -# } } else { - my $based='ip-based'; - $based='name-based' if (defined($vhost->{'VirtualByName'}) && $vhost->{'VirtualByName'} == 1); + my $key='ip-based'; + if (defined($vhost->{'VirtualByName'}) && $vhost->{'VirtualByName'} eq '1'){ + foreach my $row ( @{$vhost->{'DATA'}} ){ + $key=$row->{'VALUE'} if($row->{'KEY'} eq 'ServerName'); + } + } if (exists $vhost->{'HostIP'}){ - if ( exists $hash_table{ $vhost->{'HostIP'}} ){ push(@{$hash_table{ $vhost->{'HostIP'}}}, $vhost); } - else { push(@{$hash_table{$based}}, $vhost); } + if ( defined $hash_table{ $key} ){ push(@{$hash_table{ $key }}, $vhost); } + else { push(@{$hash_table{$key}}, $vhost); } } } } @@ -156,41 +157,6 @@ } } -#sub parse_module_selection() { -# my $class = shift; -# my $dir = Directory::vardir(); -# my $dir = "/var/lib/YaST2/"; # FIXME: calling Directory::vardir later -# my @ret = (); - -# if( open(FILE, "< $dir/httpd_active_module_selections.conf") ) { -# @ret = <FILE>; -# chomp(@ret); -# close(FILE); -# } ELse { -# return $class->SetError( summary => sprintf(_("unable to open file %s/httpd_active_module_selections.conf for reading: %s"),$dir,$!), -# code => "OPEN_FAILED" -# ); -# } - -# return \@ret; -#} - -sub write_module_selection { - my $class = shift; - my $newSelection = shift; - my $dir = "/var/lib/YaST2/"; # FIXME: calling Directory::vardir later - - if( open(FILE, "> $dir/httpd_active_module_selections.conf") ) { - print FILE join("\n",@$newSelection); - close(FILE); - } else { - return $class->SetError( summary => sprintf(_("unable to open file %s/httpd_active_module_selections.conf for writing: %s"),$dir,$!), - code => "OPEN_FAILED" - ); - } - return 1; -} - # generic apache2 configfile format parser sub sectionParser { my $keys = []; @@ -248,6 +214,11 @@ my $class = shift; my $data = shift; + # remove old files first + for my $remove ( </etc/apache2/vhosts.d/*.conf> ) { + unlink $remove; + } + foreach my $file ( keys(%{$data}) ) { next if( $file eq 'default-server.conf' ); # skip the default server here open( FILE, "> /etc/apache2/vhosts.d/$file" ) or do { @@ -413,10 +384,6 @@ } return $class->write_listen_conf(); } - } elsif( $path eq '.moduleselection' ) { - if( ref($args[0]) eq 'ARRAY' ) { - return $class->write_module_selection( $args[0] ); - } } else { # not implemented } 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 Wed Mar 25 09:24:10 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 25 09:24:13 CET 2009 - mzugec(a)suse.de + +- for name-based vhosts split configuration files (bnc#427427) +- 2.17.7 + +------------------------------------------------------------------- Fri Mar 20 19:24:06 CET 2009 - mzugec(a)suse.de - improved IP addr. validation for ip-based vhosts (bnc#486476) Modified: trunk/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/YaPI/HTTPD.pm?re… ============================================================================== --- trunk/http-server/src/YaPI/HTTPD.pm (original) +++ trunk/http-server/src/YaPI/HTTPD.pm Wed Mar 25 09:24:10 2009 @@ -526,7 +526,7 @@ if ($byname eq 0){ push(@{$vhost_files->{'ip-based'}}, {HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}); } else { - $vhost_files->{$ip} = [{HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}]; + $vhost_files->{$servername} = [{HOSTID => "$ip/$servername", HostIP => $ip, DATA => \@newdata}]; } } @@ -546,12 +546,11 @@ } } case "main" { delete $vhost_files->{'main'} if ($hostid eq 'main'); } - else { - foreach my $hostList ( $vhost_files->{$key} ) { - foreach my $hostentryHash ( @$hostList ) { delete ($vhost_files->{$key}) if ($hostentryHash->{HOSTID} eq $hostid); } - } - } - } + else { + my $vhost = $vhost_files->{$key}->[0]->{'HOSTID'}; + delete $vhost_files->{$key} if ($vhost eq $hostid); + } + } } } @@ -867,28 +866,21 @@ sub writeHosts (){ my $self = shift; - my @vhosts = (); - @vhosts = @{$vhost_files->{'ip-based'}} if (defined $vhost_files->{'ip-based'}); + # default server + my %data = ( 'default-server.conf' =>$vhost_files->{'main'}); - foreach my $key ( keys(%{$vhost_files}) ) { - switch($key) - { - case "ip-based" { - } - case "main" {} - else { - foreach my $hostList ( $vhost_files->{$key} ) { - foreach my $hostentryHash ( @$hostList ) { - push( @vhosts, $hostentryHash ) ; - } - } - } - } - } - - my %data = ( 'default-server.conf' =>$vhost_files->{'main'}); - $data{'yast2_vhosts.conf'} = \@vhosts ; + #ip based vhost + my @ip_vhosts = @{$vhost_files->{'ip-based'}} if (defined $vhost_files->{'ip-based'}); + my $size = @ip_vhosts; + $data{'ip-based_vhosts.conf'} = \@ip_vhosts if ($size>0); + + #name based vhost + foreach my $vhost ( keys(%{$vhost_files}) ) { + next if ($vhost eq 'main' || $vhost eq 'ip-based'); + my @name_vhost = @{$vhost_files->{$vhost}}; + $data{"$vhost.conf"} = \@name_vhost; + } SCR->Write(".http_server.vhosts", \%data); } -- 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] r56377 - /trunk/ftp-server/package/yast2-ftp-server.changes
by coolo＠svn.opensuse.org 24 Mar '09

24 Mar '09

Author: coolo Date: Tue Mar 24 21:10:40 2009 New Revision: 56377 URL: http://svn.opensuse.org/viewcvs/yast?rev=56377&view=rev Log: sync with abuild Modified: trunk/ftp-server/package/yast2-ftp-server.changes 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 Tue Mar 24 21:10:40 2009 @@ -6,11 +6,6 @@ (bnc#460154 ) - 2.18.0 ------------------------------------------------------------------- -Tue Feb 03 15:12:18 CEST 2008 - juhliarik(a)suse.cz - -- selected text for localization (bnc #446659) - ------------------------------------------------------------------- Thu Nov 20 12:35:28 CET 2008 - juhliarik(a)suse.cz @@ -65,6 +60,11 @@ - added 'StartupNotify=true' to the desktop file (bnc #304964) ------------------------------------------------------------------- +Tue Feb 03 15:12:18 CEST 2008 - juhliarik(a)suse.cz + +- selected text for localization (bnc #446659) + +------------------------------------------------------------------- Fri Aug 24 13:15:38 CEST 2007 - juhliarik(a)suse.cz - added patch for changing permission and starting daemons -- 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] r56376 - in /branches/tmp/coolo/update_yast_repo: last_rev_yast packs_yast
by coolo＠svn.opensuse.org 24 Mar '09

24 Mar '09

Author: coolo Date: Tue Mar 24 21:01:57 2009 New Revision: 56376 URL: http://svn.opensuse.org/viewcvs/yast?rev=56376&view=rev Log: 200 rev Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast branches/tmp/coolo/update_yast_repo/packs_yast Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Tue Mar 24 21:01:57 2009 @@ -1 +1 @@ -56104 +56376 Modified: branches/tmp/coolo/update_yast_repo/packs_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/pa… ============================================================================== --- branches/tmp/coolo/update_yast_repo/packs_yast (original) +++ branches/tmp/coolo/update_yast_repo/packs_yast Tue Mar 24 21:01:57 2009 @@ -58,6 +58,7 @@ yast2-python-bindings yast2-qt yast2-qt-pkg +yast2-qt-graph yast2-registration yast2-repair yast2-restore -- 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] r56375 - /branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp
by jreidinger＠svn.opensuse.org 24 Mar '09

24 Mar '09

Author: jreidinger Date: Tue Mar 24 19:12:27 2009 New Revision: 56375 URL: http://svn.opensuse.org/viewcvs/yast?rev=56375&view=rev Log: fix typo Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Tue Mar 24 19:12:27 2009 @@ -567,7 +567,7 @@ "other" : $[ //FIXME change to combobox and add proper init function "label" : ppc_descriptions["other"]:"other", "widget" : `textentry, - "help" : other_help_messages["other"]:"" + "help" : ppc_help_messages["other"]:"" ], ]; } -- 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] r56374 - /branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp
by jreidinger＠svn.opensuse.org 24 Mar '09

24 Mar '09

Author: jreidinger Date: Tue Mar 24 19:08:45 2009 New Revision: 56374 URL: http://svn.opensuse.org/viewcvs/yast?rev=56374&view=rev Log: add correct chainloader section for ppc Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp Tue Mar 24 19:08:45 2009 @@ -525,11 +525,50 @@ } } +symbol PPCChainloaderSectionDialog () { + y2milestone ("Running chainloader section dialog"); + string lt = Bootloader::getLoaderType (); + term contents = `HBox (`HSpacing (4), `VBox ( + // label + `Left (`Heading (_("Other System Section"))), + `VSpacing (2), + "name", + `VStretch (), + // part two - section settings + `HBox ( + // frame + `Frame (_("Section Settings"), `HBox (`HSpacing (2), `VBox ( + `VSpacing (2), + `Left("other"), + `VSpacing (2) + ), `HSpacing (2)))), + `VStretch () + ), `HSpacing (4)); + + list<string> widget_names = ["name", "other"]; + map<string,map<string,any> > widget_descr = $[]; + + widget_descr = (map<string,map<string,any> >) union (CommonGlobalWidgets (), CommonSectionWidgets ()); + + + // dialog caption + string caption = _("Boot Loader Settings: Section Management"); + return CWM::ShowAndRun ($[ + "widget_descr" : widget_descr, + "widget_names" : widget_names, + "contents" : contents, + "caption" : caption, + "back_button" : Label::BackButton (), + "abort_button" : Label::CancelButton (), + "next_button" : Label::OKButton (), + "fallback_functions" : section_handlers, + ]); +} /** * Run dialog for kernel section editation * @return symbol for wizard sequencer */ -symbol ChainloaderSectionDialog () { +symbol CommonChainloaderSectionDialog () { y2milestone ("Running chainloader section dialog"); string lt = Bootloader::getLoaderType (); term contents = `HBox (`HSpacing (4), `VBox ( @@ -577,6 +616,13 @@ ]); } +symbol ChainloaderSectionDialog () { + if ( Bootloader::getLoaderType() == "ppc" ){ + return PPCChainloaderSectionDialog(); + } else { + return CommonChainloaderSectionDialog(); + } +} /** * Run dialog for kernel section editation -- 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] r56373 - in /branches/tmp/juhliarik/bootloader-UIrefactor/src: ppc/helps.ycp routines/section_widgets.ycp
by jreidinger＠svn.opensuse.org 24 Mar '09

24 Mar '09

Author: jreidinger Date: Tue Mar 24 18:59:58 2009 New Revision: 56373 URL: http://svn.opensuse.org/viewcvs/yast?rev=56373&view=rev Log: add other widget for iseries other section Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/ppc/helps.ycp Tue Mar 24 18:59:58 2009 @@ -79,7 +79,7 @@ "copy" : _("Copy Image to Boot Partition"), "optional" : _("&Skip Section gracefully on Errors"), "type_other" : _("Boot Other System"), - "other_other" : _("Boot Partition of Other System"), + "other" : _("Boot Partition of Other System"), ]; Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Tue Mar 24 18:59:58 2009 @@ -564,6 +564,11 @@ "copy" : SectionCheckBoxWidget( ppc_descriptions["copy"]:"copy", ppc_help_messages["copy"]:""), + "other" : $[ //FIXME change to combobox and add proper init function + "label" : ppc_descriptions["other"]:"other", + "widget" : `textentry, + "help" : other_help_messages["other"]:"" + ], ]; } -- 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] r56372 - /trunk/storage/libstorage/src/Regex.h
by aschnell＠svn.opensuse.org 24 Mar '09

24 Mar '09

Author: aschnell Date: Tue Mar 24 16:59:19 2009 New Revision: 56372 URL: http://svn.opensuse.org/viewcvs/yast?rev=56372&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/Regex.h Modified: trunk/storage/libstorage/src/Regex.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Regex.h?r… ============================================================================== --- trunk/storage/libstorage/src/Regex.h (original) +++ trunk/storage/libstorage/src/Regex.h Tue Mar 24 16:59:19 2009 @@ -25,7 +25,7 @@ Regex (const string& pattern, int cflags = REG_EXTENDED, unsigned int = 10); ~Regex (); - string getPattern () const { return pattern; }; + string getPattern () const { return pattern; } int getCflags () const { return cflags; } bool match (const string&, int eflags = 0) const; -- 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] r56371 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h Disk.cc Storage.cc StorageTypes.h
by aschnell＠svn.opensuse.org 24 Mar '09

24 Mar '09

Author: aschnell Date: Tue Mar 24 15:34:38 2009 New Revision: 56371 URL: http://svn.opensuse.org/viewcvs/yast?rev=56371&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/StorageTypes.h 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 Mar 24 15:34:38 2009 @@ -41,50 +41,6 @@ return(ret); } -bool -searchFile(AsciiFile& File_Cr, string Pat_Cv, string& Line_Cr) -{ - int LineNr_ii = 0; - return searchFile(File_Cr, Pat_Cv, Line_Cr, LineNr_ii); -} - -bool -searchFile(AsciiFile& File_Cr, string Pat_Cv, string& Line_Cr, int& LineNr_ir) -{ - int End_ii; - bool Found_bi = false; - bool BeginOfLine_bi; - string Tmp_Ci; - int LineNr_ii; - string Search_Ci(Pat_Cv); - - BeginOfLine_bi = Search_Ci.length() > 0 && Search_Ci[0] == '^'; - if (BeginOfLine_bi) - Search_Ci.erase(0, 1); - End_ii = File_Cr.numLines(); - LineNr_ii = LineNr_ir; - while (!Found_bi && LineNr_ii < End_ii) - { - string::size_type Idx_ii; - - Tmp_Ci = File_Cr[LineNr_ii++]; - Idx_ii = Tmp_Ci.find(Search_Ci); - if (Idx_ii != string::npos) - { - if (BeginOfLine_bi) - Found_bi = Idx_ii == 0; - else - Found_bi = true; - } - } - if (Found_bi) - { - Line_Cr = Tmp_Ci; - LineNr_ir = LineNr_ii - 1; - } - return Found_bi; -} - void createPath(string Path_Cv) { @@ -491,7 +447,7 @@ Regex rx("^" + Regex::ws + "([0-9]+)" + Regex::ws + string(driver) + "$"); - if (find_if(lines.begin(), lines.end(), regex_matches(rx)) != lines.end()) + if (find_if(lines, regex_matches(rx)) != lines.end()) rx.cap(1) >> ret; else y2err("did not find " << driver << " in /proc/devices"); Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Tue Mar 24 15:34:38 2009 @@ -13,12 +13,6 @@ { using std::string; - -class AsciiFile; - -bool searchFile(AsciiFile& File_Cr, string Pat_Cv, string& Line_Cr); -bool searchFile(AsciiFile& File_Cr, string Pat_Cv, string& Line_Cr, - int& StartLine_ir); void createPath(string Path_Cv); bool checkNormalFile(string Path_Cv); bool checkDir(string Path_Cv); 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 Tue Mar 24 15:34:38 2009 @@ -67,107 +67,94 @@ addToList( p ); } -Disk::Disk( Storage * const s, const string& fname ) : - Container(s,"",staticType()) - { + +Disk::Disk(Storage * const s, const string& fname) + : Container(s, "", staticType()) +{ 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 ); - AsciiFile file( fname ); - string line; - if( searchFile( file, "^Device:", line ) ) - { - dev = extractNthWord( 1, line ); - } + + AsciiFile file(fname); + const vector<string>& lines = file.lines(); + vector<string>::const_iterator it; + + if ((it = find_if(lines, string_starts_with("Device:"))) != lines.end()) + dev = extractNthWord(1, *it); + mnr = mjr = 0; - if( searchFile( file, "^Major:", line ) ) - { - extractNthWord( 1, line ) >> mjr; - } - if( searchFile( file, "^Minor:", line ) ) - { - extractNthWord( 1, line ) >> mnr; - } + if ((it = find_if(lines, string_starts_with("Major:"))) != lines.end()) + extractNthWord(1, *it) >> mjr; + if ((it = find_if(lines, string_starts_with("Minor:"))) != lines.end()) + extractNthWord(1, *it) >> mnr; + range = 4; - if( searchFile( file, "^Range:", line ) ) - { - extractNthWord( 1, line ) >> range; - } + if ((it = find_if(lines, string_starts_with("Range:"))) != lines.end()) + extractNthWord(1, *it) >> range; + cyl = 1024; - if( searchFile( file, "^Cylinder:", line ) ) - { - extractNthWord( 1, line ) >> cyl; - } + if ((it = find_if(lines, string_starts_with("Cylinder:"))) != lines.end()) + extractNthWord(1, *it) >> cyl; head = 1024; - if( searchFile( file, "^Head:", line ) ) - { - extractNthWord( 1, line ) >> head; - } + if ((it = find_if(lines, string_starts_with("Head:"))) != lines.end()) + extractNthWord(1, *it) >> head; sector = 32; - if( searchFile( file, "^Sector:", line ) ) - { - extractNthWord( 1, line ) >> sector; - } + if ((it = find_if(lines, string_starts_with("Sector:"))) != lines.end()) + extractNthWord(1, *it) >> sector; byte_cyl = head * sector * 512; - if( searchFile( file, "^Label:", line ) ) - { - label = extractNthWord( 1, line ); - } + + if ((it = find_if(lines, string_starts_with("Label:"))) != lines.end()) + label = extractNthWord(1, *it); + max_primary = 0; - if( searchFile( file, "^MaxPrimary:", line ) ) - { - extractNthWord( 1, line ) >> max_primary; - } + if ((it = find_if(lines, string_starts_with("MaxPrimary:"))) != lines.end()) + extractNthWord(1, *it) >> max_primary; ext_possible = false; - if( searchFile( file, "^ExtPossible:", line ) ) - { - extractNthWord( 1, line ) >> ext_possible; - } + if ((it = find_if(lines, string_starts_with("ExtPossible:"))) != lines.end()) + extractNthWord(1, *it) >> ext_possible; max_logical = 0; - if( searchFile( file, "^MaxLogical:", line ) ) - { - extractNthWord( 1, line ) >> max_logical; - } + if ((it = find_if(lines, string_starts_with("MaxLogical:"))) != lines.end()) + extractNthWord(1, *it) >> max_logical; + ronly = false; - if( searchFile( file, "^Readonly:", line ) ) - { - extractNthWord( 1, line ) >> ronly; - } + if ((it = find_if(lines, string_starts_with("Readonly:"))) != lines.end()) + extractNthWord(1, *it) >> ronly; + if( FakeDisk() && isdigit( nm[nm.size()-1] )) - { + { string::size_type p = nm.find_last_not_of( "0123456789" ); nm.erase( p+1 ); - } + } + size_k = 0; - if( searchFile( file, "^SizeK:", line ) ) - { - extractNthWord( 1, line ) >> size_k; - } + if ((it = find_if(lines, string_starts_with("SizeK:"))) != lines.end()) + extractNthWord(1, *it) >> size_k; + udev_path.clear(); - if( searchFile( file, "^UdevPath:", line ) ) - { - udev_path = extractNthWord( 1, line ); - } + if ((it = find_if(lines, string_starts_with("UdevPath:"))) != lines.end()) + udev_path = extractNthWord(1, *it); udev_id.clear(); - if( searchFile( file, "^UdevId:", line ) ) - { - udev_id.push_back( extractNthWord( 1, line )); - } - int lnr = 0; - while( searchFile( file, "^Partition:", line, lnr )) + if ((it = find_if(lines, string_starts_with("UdevId:"))) != lines.end()) + udev_id.push_back(extractNthWord(1, *it)); + + for (it = lines.begin(); it != lines.end(); ++it) + { + if (string_starts_with("Partition:")(*it)) { - lnr++; - Partition *p = new Partition( *this, extractNthWord( 1, line, true )); - addToList( p ); + Partition* p = new Partition(*this, extractNthWord(1, *it, true)); + addToList( p ); } - y2deb("constructed disk " << dev << " from file " << fname); } + y2deb("constructed disk " << dev << " from file " << fname); +} + + Disk::~Disk() - { +{ y2deb("destructed disk " << dev); - } +} void Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Tue Mar 24 15:34:38 2009 @@ -137,7 +137,7 @@ AsciiFile sc( "/etc/sysconfig/storage" ); const vector<string>& lines = sc.lines(); Regex rx('^' + Regex::ws + "DEVICE_NAMES" + '=' + "(['\"]?)([^'\"]*)\\1" + Regex::ws + '$'); - if (find_if(lines.begin(), lines.end(), regex_matches(rx)) != lines.end()) + if (find_if(lines, regex_matches(rx)) != lines.end()) { string val = boost::to_lower_copy(rx.cap(2), locale::classic()); if( val == "id" ) @@ -815,7 +815,7 @@ for( VolIterator i=begin; i!=end; ++i ) { - vector<string>::const_iterator pos = find_if(lines.begin(), lines.end(), string_starts_with(i->device() + " ")); + vector<string>::const_iterator pos = find_if(lines, string_starts_with(i->device() + " ")); if (pos != lines.end()) { i->getTestmodeData(*pos); Modified: trunk/storage/libstorage/src/StorageTypes.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageTy… ============================================================================== --- trunk/storage/libstorage/src/StorageTypes.h (original) +++ trunk/storage/libstorage/src/StorageTypes.h Tue Mar 24 15:34:38 2009 @@ -1,6 +1,9 @@ #ifndef STORAGE_TYPES_H #define STORAGE_TYPES_H + +#include <string> +#include <vector> #include <ostream> #include <boost/algorithm/string.hpp> @@ -8,8 +11,12 @@ #include "y2storage/AppUtil.h" #include "y2storage/StorageInterface.h" + namespace storage { + using std::string; + using std::vector; + inline bool operator<(CType a, CType b) { @@ -169,6 +176,15 @@ const string& val; }; + + template <class Pred> + vector<string>::const_iterator + find_if(const vector<string>& lines, Pred pred) + { + return std::find_if(lines.begin(), lines.end(), pred); + } + } + #endif -- 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] r56370 - in /trunk/network: package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn.opensuse.org 24 Mar '09

24 Mar '09

Author: mzugec Date: Tue Mar 24 14:42:47 2009 New Revision: 56370 URL: http://svn.opensuse.org/viewcvs/yast?rev=56370&view=rev Log: tun/tap device - don't remove default gw (bnc#483233) Modified: trunk/network/package/yast2-network.changes trunk/network/src/lan/address.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 Tue Mar 24 14:42:47 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 24 14:41:57 CET 2009 - mzugec(a)suse.cz + +- tun/tap device - don't remove default gw (bnc#483233) +- 2.18.22 + +------------------------------------------------------------------- Tue Mar 24 09:30:03 CET 2009 - mzugec(a)suse.cz - improved WPA items description (bnc#481509) 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 Mar 24 14:42:47 2009 @@ -757,6 +757,13 @@ "IFCFGTYPE": LanItems::type, "IFCFGID": LanItems::device, ]; + + string drvtype = DriverType (settings["IFCFGTYPE"]:""); + + boolean is_ptp = drvtype == "ctc" || drvtype == "iucv"; + // TODO: dynamic for dummy. or add dummy from outside? + boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; + if (contains(["tun", "tap"], LanItems::type)) { settings = $[ @@ -767,16 +774,10 @@ "TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner, "TUNNEL_SET_GROUP" : LanItems::tunnel_set_group ]; + } else { + if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; } - string drvtype = DriverType (settings["IFCFGTYPE"]:""); - - boolean is_ptp = drvtype == "ctc" || drvtype == "iucv"; - // TODO: dynamic for dummy. or add dummy from outside? - boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; - - if(settings["BOOTPROTO"]:"" == "static" && settings["IPADDR"]:"" == "" && !no_dhcp) settings["BOOTPROTO"] = "dhcp"; - // #65524 if (LanItems::operation == `add && force_static_ip) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r56369 - /branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp
by jreidinger＠svn.opensuse.org 24 Mar '09

24 Mar '09

Author: jreidinger Date: Tue Mar 24 14:21:05 2009 New Revision: 56369 URL: http://svn.opensuse.org/viewcvs/yast?rev=56369&view=rev Log: simplicy browse buttons, remove browse from widget which need device Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Modified: branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/juhliarik/bootloader-UIre… ============================================================================== --- branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp (original) +++ branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/section_widgets.ycp Tue Mar 24 14:21:05 2009 @@ -55,9 +55,23 @@ } } +boolean validate_initrd(string widget, map event){ + string value = (string) UI::QueryWidget(`id(widget),`Value); + if (!Mode::installation() && !Mode::repair()){ + if (!FileUtils::Exists(value)){ + if (!Popup::YesNo(_("Initrd file doesn't exist now. Do you really want use it?"))){ + UI::SetFocus(`id(widget)); + return false; + } + } + } +} + map<string,boolean (string, map)> validation_map = $[ "image" : validate_image, + "initrd" : validate_initrd, ]; + /** * Init function for widget value * @param widget any id of the widget @@ -115,6 +129,24 @@ */ symbol HandleSectionBrowse (string widget, map event) { string current = (string)UI::QueryWidget (`id (widget), `Value); + if (current == "" || current == nil) + current = "/boot"; + // file open popup caption + current = UI::AskForExistingFile (current, "*", _("Select File")); + if (current != nil) + UI::ChangeWidget (`id (widget), `Value, current); + return nil; +} + +/** + * Handle function of a widget (InputField + browse button) + * Asks for directory instead file + * @param widget any widget key + * @param event map event description of event that occured + * @return symbol nil + */ +symbol HandleSectionBrowseDirectory (string widget, map event) { + string current = (string)UI::QueryWidget (`id (widget), `Value); // file open popup caption current = UI::AskForExistingFile (current, "*", _("Select File")); if (current != nil) @@ -155,6 +187,14 @@ return ret; } + +map<string,any> SectionInputFieldBrowseDirectoryWidget(string label, string help, string id){ + map<string,any> ret = SectionInputFieldBrowseWidget(label,help,id); + ret["handle"] = HandleSectionBrowseDirectory; + return ret; +} + + void InitSectionInt(string widget){ integer value = tointeger(BootCommon::current_section[widget]:"0"); UI::ChangeWidget (`id (widget), `Value, value); @@ -225,137 +265,8 @@ BootCommon::current_section[widget] = value; } -/** - * Init function of widget - * @param widget any id of the widget - */ -void KernelImageInit (string widget) { - string image = BootCommon::current_section["image"]:""; - list<string> available = [image]; - UI::ChangeWidget (`id (widget), `Items, available); - SectionOptionInit (widget); -} /** - * Handle function of a widget - * @param widget any widget key - * @param event map event description of event that occured - * @return symbol to return to wizard sequencer, or nil - */ -symbol KernelImageHandle (string widget, map event) { - string current = (string)UI::QueryWidget (`id (widget), `Value); - // file open popup caption - current = UI::AskForExistingFile (current, "*", _("Kernel Image")); - if (current != nil) - UI::ChangeWidget (`id (widget), `Value, current); - return nil; -} - -/** - * Init function of widget - * @param widget any id of the widget - */ -void InitrdInit (string widget) { - string initrd = BootCommon::current_section["initrd"]:""; - list<string> available = [initrd]; - UI::ChangeWidget (`id (widget), `Items, available); - SectionOptionInit (widget); -} - -/** - * Handle function of the initrd widget - * @param widget any widget key - * @param event map event description of event that occured - * @return symbol to return to wizard sequencer, or nil - */ -symbol InitrdHandle (string widget, map event) { - string current = (string)UI::QueryWidget (`id (widget), `Value); - // file open popup caption - current = UI::AskForExistingFile (current, "*", _("Initial RAM Disk")); - if (current != nil) - UI::ChangeWidget (`id (widget), `Value, current); - return nil; -} - -/** - * Init function of widget - * @param widget any id of the widget - */ -void XenInit (string widget) { - string xen = BootCommon::current_section["xen"]:""; - if (xen == "") - xen = "/boot/xen.gz"; - list<string> available = [xen]; - UI::ChangeWidget (`id (widget), `Items, available); - UI::ChangeWidget (`id (widget), `Value, xen ); -} - -/** - * Handle function of a widget - * @param widget any widget key - * @param event map event description of event that occured - * @return symbol to return to wizard sequencer, or nil - */ -symbol XenHandle (string widget, map event) { - string current = (string)UI::QueryWidget (`id (widget), `Value); - // file open popup caption - current = UI::AskForExistingFile (current, "*", _("Xen hypervisor")); - if (current != nil) - UI::ChangeWidget (`id (widget), `Value, current); - return nil; -} - -/** - * Handle function of a widget - * @param widget any widget key - * @param event map event description of event that occured - * @return symbol to return to wizard sequencer, or nil - */ -symbol TargetHandle (string widget, map event) { - string current = (string)UI::QueryWidget (`id (widget), `Value); - // file open popup caption - if (current == nil || current == "") - current = "/boot"; - current = UI::AskForExistingDirectory (current, _("Target directory")); - if (current != nil) - UI::ChangeWidget (`id (widget), `Value, current); - return nil; -} - -/** - * Handle function of a widget - * @param widget any widget key - * @param event map event description of event that occured - * @return symbol to return to wizard sequencer, or nil - */ -symbol ParmfileHandle (string widget, map event) { - string current = (string)UI::QueryWidget (`id (widget), `Value); - // file open popup caption - if (current == nil || current == "") - current = "/boot/"; - current = UI::AskForExistingFile (current, "*" , _("Select parmfile")); - if (current != nil) - UI::ChangeWidget (`id (widget), `Value, current); - return nil; -} - -/** - * Handle function of a widget - * @param widget any widget key - * @param event map event description of event that occured - * @return symbol to return to wizard sequencer, or nil - */ -symbol DumptoHandle (string widget, map event) { - string current = (string)UI::QueryWidget (`id (widget), `Value); - // file open popup caption - if (current == nil || current == "") - current = "/dev/"; - current = UI::AskForExistingFile (current, "" , _("Select device")); - if (current != nil) - UI::ChangeWidget (`id (widget), `Value, current); - return nil; -} -/** * Init function of the root device widget * @param widget any id of the widget */ @@ -436,21 +347,6 @@ } /** - * Handle function of the chainloader widget - * @param widget any widget key - * @param event map event description of event that occured - * @return symbol to return to wizard sequencer, or nil - */ -symbol ChainloaderHandle (string widget, map event) { - string current = (string)UI::QueryWidget (`id (widget), `Value); - // file open popup caption - current = UI::AskForExistingFile (current, "*", _("Device to Boot")); - if (current != nil) - UI::ChangeWidget (`id (widget), `Value, current); - return nil; -} - -/** * Widget for selecting section type * @return term widget */ @@ -562,113 +458,31 @@ grub_descriptions["image"]:"image", grub_help_messages["image"]:"", "image"), - "initrd" : $[ - "widget" : `custom, - "custom_widget" : Stage::initial () - ? `InputField (`id ("initrd"), `opt (`hstretch), - // text entry - grub_descriptions["initrd"]:"initrd") - : `HBox ( - `ComboBox (`id ("initrd"), `opt (`editable, `hstretch), - // combo box - grub_descriptions["initrd"]:"initrd", - []), - `VBox ( - `Label (""), - `PushButton (`id (`initrd_browse), - Label::BrowseButton ()) - ) - ), - "init" : InitrdInit, - "handle" : InitrdHandle, - "handle_events" : [ `initrd_browse ], - "help" : grub_help_messages["initrd"]:"", - ], - "xen" : $[ - "widget" : `custom, - "custom_widget" : Stage::initial () - ? `InputField (`id ("xen"), `opt (`hstretch), - _("Hypervisor")// text entry - ) - : `HBox ( - `ComboBox (`id ("xen"), `opt (`editable, `hstretch), - // combo box - _("Hypervisor"), - []), - `VBox ( - `Label (""), - `PushButton (`id (`xen_browse), - Label::BrowseButton ()) - ) - ), - "init" : XenInit, - "handle" : XenHandle, - "handle_events" : [ `xen_browse ], - "help" : grub_help_messages["xen"]:"", - ], - "target" : $[ - "widget" : `custom, - "custom_widget" : - `HBox ( - `InputField (`id ("target"), `opt (`hstretch), - zipl_descriptions["target"]:"target"), - `VBox ( - `Label (""), - `PushButton (`id (`target_browse), - Label::BrowseButton ()) - ) - ), - "handle" : TargetHandle, - "handle_events" : [ `target_browse ], - "help" : zipl_help_messages["target"]:"", - ], - "parmfile" : $[ - "widget" : `custom, - "custom_widget" : - `HBox ( - `InputField (`id ("parmfile"), `opt (`hstretch), - zipl_descriptions["parmfile"]:"parmfile"), - `VBox ( - `Label (""), - `PushButton (`id (`parm_browse), - Label::BrowseButton ()) - ) - ), - "handle" : ParmfileHandle, - "handle_events" : [ `parm_browse ], - "help" : zipl_help_messages["parmfile"]:"", - ], - "dumpto" : $[ - "widget" : `custom, - "custom_widget" : - `HBox ( - `InputField (`id ("dumpto"), `opt (`hstretch), - zipl_descriptions["dumpto"]:"dumpto"), - `VBox ( - `Label (""), - `PushButton (`id (`dumpto_browse), - Label::BrowseButton ()) - ) - ), - "handle" : DumptoHandle, - "handle_events" : [ `dumpto_browse ], - "help" : zipl_help_messages["dumpto"]:"", + "initrd" : SectionInputFieldBrowseWidget( + grub_descriptions["initrd"]:"initrd", + grub_help_messages["initrd"]:"", + "initrd"), + "xen" : SectionInputFieldBrowseWidget( + grub_descriptions["xen"]:"xen", + grub_help_messages["xen"]:"", + "xen"), + "target" : SectionInputFieldBrowseDirectoryWidget( + zipl_descriptions["target"]:"target", + zipl_help_messages["target"]:"", + "target"), + "parmfile" : SectionInputFieldBrowseWidget( + zipl_descriptions["parmfile"]:"parmfile", + zipl_help_messages["parmfile"]:"", + "parmfile"), + "dumpto" : $[ //FIXME when exist browse device use it + "label" : zipl_descriptions["dumpto"]:"dumpto", + "widget" : `textentry, + "help" : zipl_help_messages["dumpto"]:"" ], - "dumptofs" : $[ - "widget" : `custom, - "custom_widget" : - `HBox ( - `InputField (`id ("dumptofs"), `opt (`hstretch), - zipl_descriptions["dumptofs"]:"dumptofs"), - `VBox ( - `Label (""), - `PushButton (`id (`dumptofs_browse), - Label::BrowseButton ()) - ) - ), - "handle" : DumptoHandle, - "handle_events" : [ `dumptofs_browse ], - "help" : zipl_help_messages["dumptofs"]:"", + "dumptofs" : $[ //FIXME when exist browse device use it + "label" : zipl_descriptions["dumptofs"]:"dumptofs", + "widget" : `textentry, + "help" : zipl_help_messages["dumptofs"]:"" ], "root" : $[ "widget" : `combobox, @@ -689,7 +503,6 @@ "help" : grub_help_messages["vgamode"]:"", ], "append" : $[ - // text entry "label" : grub_descriptions["append"]:"append", "widget" : `textentry, "help" : grub_help_messages["append"]:"" @@ -710,23 +523,10 @@ "help" : zipl_help_messages["list"]:"", ], "chainloader" : $[ - "widget" : `custom, - "custom_widget" : `HBox ( - `ComboBox (`id ("chainloader"), - `opt (`editable, `hstretch), - // combo box - grub_descriptions["chainloader"]:"chainloader", - []), - `VBox ( - `Label (""), - `PushButton (`id (`chainloader_browse), - Label::BrowseButton ()) - ) - ), + "widget" : `combobox, "init" : ChainloaderInit, - "handle" : ChainloaderHandle, - "handle_events" : [ `chainloader_browse ], - "help" : grub_help_messages["chainloader"]:"" + "help" : grub_help_messages["chainloader"]:"", + "opt" : [ `editable, `hstretch ], ], "section_type" : $[ "widget" : `func, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0