March 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55878 - /trunk/devtools/devtools/admin/po/Makefile.am.center
by keichwa＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: keichwa Date: Tue Mar 3 13:46:38 2009 New Revision: 55878 URL: http://svn.opensuse.org/viewcvs/yast?rev=55878&view=rev Log: add --previous switch to msgmerge command Modified: trunk/devtools/devtools/admin/po/Makefile.am.center Modified: trunk/devtools/devtools/admin/po/Makefile.am.center URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/admin/po/Makef… ============================================================================== --- trunk/devtools/devtools/admin/po/Makefile.am.center (original) +++ trunk/devtools/devtools/admin/po/Makefile.am.center Tue Mar 3 13:46:38 2009 @@ -21,7 +21,7 @@ stat=status.txt PO_STATS=@ybindir@/po-stats -MSGMERGE = @MSGMERGE@ --no-wrap --force-po +MSGMERGE = @MSGMERGE@ --no-wrap --force-po --previous MSGFMT = @MSGFMT@ MSGCAT = @MSGCAT@ --no-wrap --force-po MSGCONV = @MSGCONV@ --no-wrap --force-po -- 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] r55877 - /trunk/apparmor/src/include/subdomain/profile_dialogs.ycp
by kmachalkova＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: kmachalkova Date: Tue Mar 3 13:44:55 2009 New Revision: 55877 URL: http://svn.opensuse.org/viewcvs/yast?rev=55877&view=rev Log: Feed profile data correctly into UI (1st step in adjusting AA profile editor to changed syntax) Modified: trunk/apparmor/src/include/subdomain/profile_dialogs.ycp Modified: trunk/apparmor/src/include/subdomain/profile_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/p… ============================================================================== --- trunk/apparmor/src/include/subdomain/profile_dialogs.ycp (original) +++ trunk/apparmor/src/include/subdomain/profile_dialogs.ycp Tue Mar 3 13:44:55 2009 @@ -11,6 +11,7 @@ import "Wizard"; import "Popup"; import "Label"; +import "Map"; include "subdomain/capabilities.ycp"; textdomain "yast2-apparmor"; @@ -590,24 +591,29 @@ // define list<term> generateTableContents( map paths, map network, map caps, map includes, map hats ) { - list<term> newlist = []; + list<term> newlist = []; + integer indx = 0; foreach( string hatname, any hat, (map<string,map>) hats, { newlist = add( newlist, `item( `id(indx), "[+] ^"+ hatname, "")); indx = indx+1; }); + foreach( string incname, integer incval, (map<string,integer>) includes, { newlist = add( newlist, `item( `id(indx), "#include " +incname, "")); indx = indx+1; }); - foreach( string capname, integer capval, (map<string,integer>) caps, { + + foreach( string capname, map capval, (map<string,map>) caps, { map capdef = capdefs[capname]:nil; newlist = add( newlist, `item( `id(indx), capdef["name"]:"", "")); indx = indx+1; }); - foreach( string name, string val, (map<string,string>) paths, { - newlist = add( newlist, `item( `id(indx), name, val)); + + foreach( string name, map val, (map<string,map>) paths, { + newlist = add( newlist, `item( `id(indx), name, val["mode"]:0)); indx = indx+1; }); - foreach( string family, any any_fam, (map<string,any>) network, { + map rules = network["rule"]:$[]; + foreach( string family, any any_fam, (map<string,map>) rules, { if ( is( any_fam, map ) ) { foreach( string socktype, any any_type, (map<string,any>) any_fam, { newlist = add( newlist, @@ -725,10 +731,10 @@ if ( !hat ) { hats = collectHats( profile_map, pathname ); } - map paths = (map) profile["path"]:$[]; - map caps = (map) profile["capability"]:$[]; + map paths = (map) profile["allow","path"]:$[]; + map caps = (map) profile["allow","capability"]:$[]; map includes = (map) profile["include"]:$[]; - map netdomain = (map) profile["netdomain"]:$[]; + map netdomain = (map) profile["allow", "netdomain"]:$[]; list<term> profilelist = generateTableContents( paths, netdomain, caps, -- 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] r55876 - in /trunk/storage/libstorage/src: AsciiFile.cc AsciiFile.h
by aschnell＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: aschnell Date: Tue Mar 3 13:41:05 2009 New Revision: 55876 URL: http://svn.opensuse.org/viewcvs/yast?rev=55876&view=rev Log: - added some consts Modified: trunk/storage/libstorage/src/AsciiFile.cc trunk/storage/libstorage/src/AsciiFile.h Modified: trunk/storage/libstorage/src/AsciiFile.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile… ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.cc (original) +++ trunk/storage/libstorage/src/AsciiFile.cc Tue Mar 3 13:41:05 2009 @@ -69,7 +69,7 @@ return appendFile( File_Cv, Lines_C ); } -bool AsciiFile::appendFile( const string& Name_Cv, vector<string>& Lines_Cr ) +bool AsciiFile::appendFile( const string& Name_Cv, vector<string>& Lines_Cr ) const { ifstream File_Ci( Name_Cv.c_str() ); classic(File_Ci); @@ -86,7 +86,7 @@ return Ret_bi; } -bool AsciiFile::appendFile( AsciiFile& File_Cv, vector<string>& Lines_Cr ) +bool AsciiFile::appendFile( AsciiFile& File_Cv, vector<string>& Lines_Cr ) const { unsigned Idx_ii = 0; @@ -190,7 +190,7 @@ return File_Ci.good(); } -bool AsciiFile::removeIfEmpty() +bool AsciiFile::removeIfEmpty() const { bool ret = Lines_C.empty(); if( ret && access( Name_C.c_str(), W_OK )==0 ) Modified: trunk/storage/libstorage/src/AsciiFile.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile… ============================================================================== --- trunk/storage/libstorage/src/AsciiFile.h (original) +++ trunk/storage/libstorage/src/AsciiFile.h Tue Mar 3 13:41:05 2009 @@ -46,13 +46,13 @@ unsigned numLines() const; const string& fileName() const; unsigned differentLine( const AsciiFile& File_Cv ) const; - bool removeIfEmpty(); + bool removeIfEmpty() const; const vector<string>& lines() const { return Lines_C; } protected: - bool appendFile( const string& Name_Cv, std::vector<string>& Lines_Cr ); - bool appendFile( AsciiFile& File_Cv, std::vector<string>& Lines_Cr ); + bool appendFile( const string& Name_Cv, std::vector<string>& Lines_Cr ) const; + bool appendFile( AsciiFile& File_Cv, std::vector<string>& Lines_Cr ) const; void removeLastIf(string& Text_Cr, char Char_cv) const; bool BackupCreated_b; -- 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] r55875 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h
by aschnell＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: aschnell Date: Tue Mar 3 13:25:45 2009 New Revision: 55875 URL: http://svn.opensuse.org/viewcvs/yast?rev=55875&view=rev Log: - avoid calling external program Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.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 3 13:25:45 2009 @@ -21,6 +21,8 @@ #include "y2storage/StorageTmpl.h" #include "y2storage/AppUtil.h" #include "y2storage/SystemCmd.h" +#include "y2storage/StorageTypes.h" + using namespace std; @@ -486,18 +488,25 @@ } -unsigned getMajorDevices( const string& driver ) - { - unsigned ret=0; - string cmd = "grep \" " + driver + "$\" /proc/devices"; - SystemCmd c( cmd ); - if( c.numLines()>0 ) - { - extractNthWord( 0, c.getLine(0)) >> ret; - } - y2mil( "driver:" << driver << " ret:" << ret ); - return( ret ); - } +unsigned +getMajorDevices(const char* driver) +{ + unsigned ret = 0; + + AsciiFile file("/proc/devices"); + const std::vector<string>& lines = file.lines(); + + Regex rx("^" + Regex::ws + "([0-9]+)" + Regex::ws + string(driver) + "$"); + + std::vector<string>::const_iterator it = find_if(lines.begin(), lines.end(), match_regex(rx)); + if (it == lines.end()) + y2err("did not find " << driver << " in /proc/devices"); + else + rx.cap(1) >> ret; + + y2mil("driver:" << driver << " ret:" << ret); + return ret; +} string sformat(const char* format, ...) 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 3 13:25:45 2009 @@ -44,7 +44,8 @@ string undevDevice( const string& dev ); void undevDevice( string& dev ); bool isNfsDev( const string& dev ); -unsigned getMajorDevices( const string& driver ); + +unsigned getMajorDevices(const char* driver); template<class StreamType> -- 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] r55874 - /tags/stable-2_18_1/iscsi-server/
by mzugec＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: mzugec Date: Tue Mar 3 13:23:52 2009 New Revision: 55874 URL: http://svn.opensuse.org/viewcvs/yast?rev=55874&view=rev Log: Created tag stable-2_18_1 for iscsi-server Added: tags/stable-2_18_1/iscsi-server/ - copied from r55872, trunk/iscsi-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] r55873 - /tags/branch-SLE-10-SP3-2_13_28/iscsi-server/
by mzugec＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: mzugec Date: Tue Mar 3 13:23:51 2009 New Revision: 55873 URL: http://svn.opensuse.org/viewcvs/yast?rev=55873&view=rev Log: Created tag branch-SLE-10-SP3-2_13_28 for iscsi-server Added: tags/branch-SLE-10-SP3-2_13_28/iscsi-server/ - copied from r55872, branches/SuSE-SLE-10-SP3-Branch/iscsi-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] r55872 - /tags/branch-SLE-10-SP3-2_13_28/
by mzugec＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: mzugec Date: Tue Mar 3 13:23:48 2009 New Revision: 55872 URL: http://svn.opensuse.org/viewcvs/yast?rev=55872&view=rev Log: Created tag branch-SLE-10-SP3-2_13_28 Added: tags/branch-SLE-10-SP3-2_13_28/ -- 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] r55871 - in /trunk/iscsi-server: VERSION package/yast2-iscsi-server.changes src/IscsiServerFunctions.pm
by mzugec＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: mzugec Date: Tue Mar 3 13:23:43 2009 New Revision: 55871 URL: http://svn.opensuse.org/viewcvs/yast?rev=55871&view=rev Log: handle exceptions - thanks to ajohansson(a)novell.com (bnc#481379) Modified: trunk/iscsi-server/VERSION trunk/iscsi-server/package/yast2-iscsi-server.changes trunk/iscsi-server/src/IscsiServerFunctions.pm Modified: trunk/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/VERSION?rev=55871&r… ============================================================================== --- trunk/iscsi-server/VERSION (original) +++ trunk/iscsi-server/VERSION Tue Mar 3 13:23:43 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-server/package/yast2-iscsi-server.changes (original) +++ trunk/iscsi-server/package/yast2-iscsi-server.changes Tue Mar 3 13:23:43 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 3 13:18:40 CET 2009 - mzugec(a)suse.cz + +- handle exceptions - thanks to ajohansson(a)novell.com (bnc#481379) +- 2.18.1 + +------------------------------------------------------------------- Mon Jan 26 14:52:22 CET 2009 - mzugec(a)suse.cz - button labeling (bnc#440542) Modified: trunk/iscsi-server/src/IscsiServerFunctions.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-server/src/IscsiServerFunc… ============================================================================== --- trunk/iscsi-server/src/IscsiServerFunctions.pm (original) +++ trunk/iscsi-server/src/IscsiServerFunctions.pm Tue Mar 3 13:23:43 2009 @@ -307,10 +307,14 @@ } } # write 'iSNS' and 'auth' into %new_config - $config_file{'value'} = $new_config{'iSNS'}; + if (defined $new_config{'iSNS'}){ + $config_file{'value'} = $new_config{'iSNS'}; delete ($new_config{'iSNS'}); - if (exists $new_config{'auth'}) { @{$config_file{'value'}} = (@{$config_file{'value'}}, @{$new_config{'auth'}}) } + } + if (defined $new_config{'auth'}){ + @{$config_file{'value'}} = (@{$config_file{'value'}}, @{$new_config{'auth'}}) ; delete ($new_config{'auth'}); + } #write all targets into %new_config foreach my $key (reverse(keys %new_config )){ if (not ref($new_config{$key})){ -- 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] r55870 - in /branches/SuSE-SLE-10-SP3-Branch/iscsi-server: VERSION package/yast2-iscsi-server.changes src/IscsiServerFunctions.pm
by mzugec＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: mzugec Date: Tue Mar 3 13:23:33 2009 New Revision: 55870 URL: http://svn.opensuse.org/viewcvs/yast?rev=55870&view=rev Log: handle exceptions - thanks to ajohansson(a)novell.com (bnc#481379) Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-server/VERSION branches/SuSE-SLE-10-SP3-Branch/iscsi-server/package/yast2-iscsi-server.changes branches/SuSE-SLE-10-SP3-Branch/iscsi-server/src/IscsiServerFunctions.pm Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-server/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-server/VERSION Tue Mar 3 13:23:33 2009 @@ -1 +1 @@ -2.13.27 +2.13.28 Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-server/package/yast2-iscsi-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-server/package/yast2-iscsi-server.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-server/package/yast2-iscsi-server.changes Tue Mar 3 13:23:33 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Mar 3 13:16:47 CET 2009 - mzugec(a)suse.cz + +- handle exceptions - thanks to ajohansson(a)novell.com (bnc#481379) +- 2.13.28 + +------------------------------------------------------------------- Tue Dec 16 13:46:27 CET 2008 - mzugec(a)suse.de - fixed IscsiServerFunctions::writeConfig (bnc#459006) Modified: branches/SuSE-SLE-10-SP3-Branch/iscsi-server/src/IscsiServerFunctions.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/iscsi-… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/iscsi-server/src/IscsiServerFunctions.pm (original) +++ branches/SuSE-SLE-10-SP3-Branch/iscsi-server/src/IscsiServerFunctions.pm Tue Mar 3 13:23:33 2009 @@ -307,10 +307,14 @@ } } # write 'iSNS' and 'auth' into %new_config - $config_file{'value'} = $new_config{'iSNS'}; + if (defined $new_config{'iSNS'}){ + $config_file{'value'} = $new_config{'iSNS'}; delete ($new_config{'iSNS'}); - @{$config_file{'value'}} = (@{$config_file{'value'}}, @{$new_config{'auth'}}) if exists $new_config{'auth'}; + } + if (defined $new_config{'auth'}){ + @{$config_file{'value'}} = (@{$config_file{'value'}}, @{$new_config{'auth'}}) ; delete ($new_config{'auth'}); + } #write all targets into %new_config foreach my $key (reverse(keys %new_config )){ if (not ref($new_config{$key})){ -- 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] r55869 - /branches/tmp/juhliarik/bootloader-UIrefactor/src/routines/dialogs.ycp
by juhliarik＠svn.opensuse.org 03 Mar '09

03 Mar '09

Author: juhliarik Date: Tue Mar 3 13:06:00 2009 New Revision: 55869 URL: http://svn.opensuse.org/viewcvs/yast?rev=55869&view=rev Log: updated button labels 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 3 13:06:00 2009 @@ -193,7 +193,7 @@ "contents" : contents, "caption" : caption, "back_button" : Label::BackButton (), - "abort_button" : (!Mode::installation()) ? Label::AbortButton () : Label::CancelButton (), + "abort_button" : Label::CancelButton (), "next_button" : Label::OKButton (), "fallback_functions" : section_handlers, ]); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0