July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r65063 - /branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp
by fehr＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: fehr Date: Thu Jul 28 12:30:17 2011 New Revision: 65063 URL: http://svn.opensuse.org/viewcvs/yast?rev=65063&view=rev Log: remove file obsolete by backport Removed: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/do_proposal_flexible.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65062 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Volume.cc package/yast2-storage.changes
by fehr＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: fehr Date: Thu Jul 28 12:27:27 2011 New Revision: 65062 URL: http://svn.opensuse.org/viewcvs/yast?rev=65062&view=rev Log: remove subvol=@ from /etc/fstab to work around bnc#703204 Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Thu Jul 28 12:27:27 2011 @@ -2768,7 +2768,8 @@ l.push_front( lstr ); if( l.size()>1 && (enc=find( l.begin(), l.end(), "defaults" ))!=l.end() ) l.erase(enc); - + // FIXME: temporary code that circumvents currently failing subvol=... option + l.remove_if( string_starts_with("subvol=") ); return l; } Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu Jul 28 12:27:27 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jul 28 12:25:40 CEST 2011 - fehr(a)suse.de + +- remove subvol=@ from /etc/fstab to work around bnc#703204 + +------------------------------------------------------------------- Tue Jul 26 12:21:56 CEST 2011 - aschnell(a)suse.de - fixed commit action calculation for DASDs (bnc#706911) -- 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] r65061 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: fehr Date: Thu Jul 28 12:21:59 2011 New Revision: 65061 URL: http://svn.opensuse.org/viewcvs/yast?rev=65061&view=rev Log: - adapt to work with iscsi_offload script in open-iscsi - 2.21.2 Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=65061&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Thu Jul 28 12:21:59 2011 @@ -1 +1 @@ -2.21.1 +2.21.2 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 Thu Jul 28 12:21:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 12:17:34 CEST 2011 - fehr(a)suse.de + +- adapt to work with iscsi_offload script in open-iscsi +- 2.21.2 + +------------------------------------------------------------------- Tue Jul 12 18:13:53 CEST 2011 - fehr(a)suse.de - delay offload initialisation into init function 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 Thu Jul 28 12:21:59 2011 @@ -31,6 +31,8 @@ // interface type for hardware offloading string offload_card = "default"; +string offboard_script = "iscsi_offload"; + void CallConfigScript(); global string GetOffloadCard() @@ -696,23 +698,63 @@ ``{ if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) offload_valid[idx] = add( offload_valid[idx]:[], - [ hw["iface"]:"", hw["macaddr"]:""] ); + [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+hw["modules",0]:""] ); }); } idx = idx+1; }); + map<string,map> offload_res = $[]; + string cmd = ""; + foreach( integer i, list eth, offload_valid, + { + offload_valid[i] = filter( list l, (list<list>)eth, + { + cmd = offboard_script + " " + l[0]:""; + y2milestone( "GetOffloadItems cmd:%1", cmd ); + map out = (map) SCR::Execute (.target.bash_output, cmd ); + y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); + offload_res[l[0]:""] = $[]; + offload_res[l[0]:"","exit"] = out["exit"]:1; + list<string> sl = []; + if( out["exit"]:1==0 ) + { + sl = splitstring( out["stdout"]:"", " \n" ); + offload_res[l[0]:"","hwaddr"] = sl[0]:""; + offload_res[l[0]:"","ntype"] = sl[1]:""; + } + return out["exit"]:1==0 && size(sl[0]:"")>0; + }); + }); + y2milestone( "GetOffloadItems offload_res:%1", offload_res ); + y2milestone( "GetOffloadItems offload_valid:%1", offload_valid ); + foreach( integer i, list eth, offload_valid, + { + offload_valid[i] = maplist( list l, (list<list>)eth, + { + l[1] = offload_res[l[0]:"","hwaddr"]:""; + return( l ); + }); + }); + y2milestone( "GetOffloadItems offload_valid:%1", offload_valid ); foreach( integer i, list eth, offload_valid, { offload_valid[i] = maplist( list l, (list<list>)eth, { - map out = (map) SCR::Execute (.target.bash_output, "ifconfig " + l[0]:"" ); + cmd = "ifconfig " + l[0]:""; + y2milestone( "GetOffloadItems cmd:%1", cmd ); + map out = (map) SCR::Execute (.target.bash_output, cmd ); y2milestone( "GetOffloadItems out:%1", out ); string line = filter( string ln, splitstring( out["stdout"]:"", "\n" ), ``(search(ln,"inet addr:")!=nil))[0]:""; y2milestone( "GetOffloadItems line:%1", line ); - line = substring( line, search( line, "inet addr:")+10 ); - y2milestone( "GetOffloadItems line:%1", line ); - l = add( l, substring( line, 0, findfirstof( line, " \t" )) ); + string ipaddr = "unknown"; + if( size(line)>0 ) + { + line = substring( line, search( line, "inet addr:")+10 ); + y2milestone( "GetOffloadItems line:%1", line ); + ipaddr = substring( line, 0, findfirstof( line, " \t" ) ); + } + l = add( l, ipaddr ); return( l ); }); }); @@ -729,7 +771,7 @@ if( size(l[1]:"" )>0 ) s = s + " - " + l[1]:""; s = s + " - " + offload[i,1]:""; - entries[l[0]:""] = s; + entries[l[2]:""] = s; } }); }); @@ -772,17 +814,16 @@ y2milestone( "CallConfigScript list:%1", sl ); foreach( string s, sl, { - string cmd = "/sbin/iscsi-offload-config " + " "; list hw = []; hw = maplist( integer i, list e, filter( integer i, list eth, offload_valid, ``(contains(flatten((list<list>)eth),s))), ``(e))[0]:[]; y2milestone( "CallConfigScript hw:%1", hw ); - hw = find( list l, (list<list>)hw, ``(l[0]:""==s)); + hw = find( list l, (list<list>)hw, ``(l[2]:""==s)); y2milestone( "CallConfigScript hw:%1", hw ); if( hw != nil ) { - cmd = cmd + hw[1]:"" + " " + hw[2]:"" + " " + s; + string cmd = offboard_script + " " + hw[0]:""; y2milestone( "CallConfigScript cmd:%1", cmd ); map output = (map)SCR::Execute(.target.bash_output, cmd ); y2milestone( "CallConfigScript %1", output ); -- 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] r65060 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: fehr Date: Thu Jul 28 12:18:43 2011 New Revision: 65060 URL: http://svn.opensuse.org/viewcvs/yast?rev=65060&view=rev Log: - adapt to work with iscsi_offload script in open-iscsi - 2.17.26 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION Thu Jul 28 12:18:43 2011 @@ -1 +1 @@ -2.17.25 +2.17.26 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Thu Jul 28 12:18:43 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 28 12:17:34 CEST 2011 - fehr(a)suse.de + +- adapt to work with iscsi_offload script in open-iscsi +- 2.17.26 + +------------------------------------------------------------------- Tue Jul 12 18:13:53 CEST 2011 - fehr(a)suse.de - delay offload initialisation into init function Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Thu Jul 28 12:18:43 2011 @@ -31,6 +31,8 @@ // interface type for hardware offloading string offload_card = "default"; +string offboard_script = "iscsi_offload"; + void CallConfigScript(); global string GetOffloadCard() @@ -697,23 +699,63 @@ //if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) if( size(mod)+size(hw["modules"]:[])>size(union(mod,hw["modules"]:[]))) offload_valid[idx] = add( offload_valid[idx]:[], - [ hw["iface"]:"", hw["macaddr"]:""] ); + [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+hw["modules",0]:""] ); }); } idx = idx+1; }); + map<string,map> offload_res = $[]; + string cmd = ""; + foreach( integer i, list eth, offload_valid, + { + offload_valid[i] = filter( list l, (list<list>)eth, + { + cmd = offboard_script + " " + l[0]:""; + y2milestone( "GetOffloadItems cmd:%1", cmd ); + map out = (map) SCR::Execute (.target.bash_output, cmd ); + y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); + offload_res[l[0]:""] = $[]; + offload_res[l[0]:"","exit"] = out["exit"]:1; + list<string> sl = []; + if( out["exit"]:1==0 ) + { + sl = splitstring( out["stdout"]:"", " \n" ); + offload_res[l[0]:"","hwaddr"] = sl[0]:""; + offload_res[l[0]:"","ntype"] = sl[1]:""; + } + return out["exit"]:1==0 && size(sl[0]:"")>0; + }); + }); + y2milestone( "GetOffloadItems offload_res:%1", offload_res ); + y2milestone( "GetOffloadItems offload_valid:%1", offload_valid ); + foreach( integer i, list eth, offload_valid, + { + offload_valid[i] = maplist( list l, (list<list>)eth, + { + l[1] = offload_res[l[0]:"","hwaddr"]:""; + return( l ); + }); + }); + y2milestone( "GetOffloadItems offload_valid:%1", offload_valid ); foreach( integer i, list eth, offload_valid, { offload_valid[i] = maplist( list l, (list<list>)eth, { - map out = (map) SCR::Execute (.target.bash_output, "ifconfig " + l[0]:"" ); + cmd = "ifconfig " + l[0]:""; + y2milestone( "GetOffloadItems cmd:%1", cmd ); + map out = (map) SCR::Execute (.target.bash_output, cmd ); y2milestone( "GetOffloadItems out:%1", out ); string line = filter( string ln, splitstring( out["stdout"]:"", "\n" ), ``(search(ln,"inet addr:")!=nil))[0]:""; y2milestone( "GetOffloadItems line:%1", line ); - line = substring( line, search( line, "inet addr:")+10 ); - y2milestone( "GetOffloadItems line:%1", line ); - l = add( l, substring( line, 0, findfirstof( line, " \t" )) ); + string ipaddr = "unknown"; + if( size(line)>0 ) + { + line = substring( line, search( line, "inet addr:")+10 ); + y2milestone( "GetOffloadItems line:%1", line ); + ipaddr = substring( line, 0, findfirstof( line, " \t" ) ); + } + l = add( l, ipaddr ); return( l ); }); }); @@ -730,7 +772,7 @@ if( size(l[1]:"" )>0 ) s = s + " - " + l[1]:""; s = s + " - " + offload[i,1]:""; - entries[l[0]:""] = s; + entries[l[2]:""] = s; } }); }); @@ -773,17 +815,16 @@ y2milestone( "CallConfigScript list:%1", sl ); foreach( string s, sl, { - string cmd = "/sbin/iscsi-offload-config " + " "; list hw = []; hw = maplist( integer i, list e, filter( integer i, list eth, offload_valid, ``(contains(flatten((list<list>)eth),s))), ``(e))[0]:[]; y2milestone( "CallConfigScript hw:%1", hw ); - hw = find( list l, (list<list>)hw, ``(l[0]:""==s)); + hw = find( list l, (list<list>)hw, ``(l[2]:""==s)); y2milestone( "CallConfigScript hw:%1", hw ); if( hw != nil ) { - cmd = cmd + hw[1]:"" + " " + hw[2]:"" + " " + s; + string cmd = offboard_script + " " + hw[0]:""; y2milestone( "CallConfigScript cmd:%1", cmd ); map output = (map)SCR::Execute(.target.bash_output, cmd ); y2milestone( "CallConfigScript %1", output ); -- 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] r65059 - in /branches/SuSE-Code-11-SP2-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: rhafer Date: Thu Jul 28 11:59:23 2011 New Revision: 65059 URL: http://svn.opensuse.org/viewcvs/yast?rev=65059&view=rev Log: Preparing 2.17.40 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/VERSION Thu Jul 28 11:59:23 2011 @@ -1 +1 @@ -2.17.39 +2.17.40 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/package/yast2-ldap-server.changes Thu Jul 28 11:59:23 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 28 09:43:10 UTC 2011 - rhafer(a)suse.de + +- Version 2.17.40 +- Added .desktop file for MirrorMode UI (bnc#708869) +- splitted MirrorMode UI into separate subpackage (fate#312032) + +------------------------------------------------------------------- Tue Jul 19 15:43:28 UTC 2011 - rhafer(a)suse.de - Version 2.17.39 -- 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] r65058 - /branches/SuSE-Code-11-SP2-Branch/ldap-server/yast2-ldap-server.spec.in
by rhafer＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: rhafer Date: Thu Jul 28 11:59:21 2011 New Revision: 65058 URL: http://svn.opensuse.org/viewcvs/yast?rev=65058&view=rev Log: put separate MirrorMode UI into separate subpackage see discussion in fate#312032 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/yast2-ldap-server.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/yast2-ldap-server.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/yast2-ldap-server.spec.in Thu Jul 28 11:59:21 2011 @@ -8,6 +8,14 @@ %description - +%package -n yast2-openldap-mirrormode +Summary: YaST2 module to manage OpenLDAP MirrorMode nodes +Group: System/YaST +Requires: yast2-ldap-server >= 2.17.40 + +%description -n yast2-openldap-mirrormode +The YaST2 component to add and remove nodes to an OpenLDAP MirrorMode setup + @PREP@ @BUILD@ @@ -26,17 +34,26 @@ %defattr(-,root,root) %dir @yncludedir@/ldap-server %dir @moduledir@/YaPI -@yncludedir@/ldap-server/* +@yncludedir@/ldap-server/complex.ycp +@yncludedir@/ldap-server/dialogs.ycp +@yncludedir@/ldap-server/helps.ycp +@yncludedir@/ldap-server/tree_structure.ycp +@yncludedir@/ldap-server/widgets.ycp +@yncludedir@/ldap-server/wizards.ycp @clientdir@/ldap-server.ycp -@clientdir@/openldap-mirrormode.ycp @clientdir@/ldap-server_*.ycp @moduledir@/LdapServer.* @moduledir@/LdapDatabase.* @moduledir@/YaPI/LdapServer.pm @desktopdir@/ldap-server.desktop -@desktopdir@/openldap-mirrormode.desktop @plugindir@/libpy2ag_slapdconfig.* @schemadir@/autoyast/rnc/ldap-server.rnc @scrconfdir@/* @ybindir@/ldap-server-ssl-check %doc @docdir@ + +%files -n yast2-openldap-mirrormode +%defattr(-,root,root) +@yncludedir@/ldap-server/mirrormode-wizard.ycp +@clientdir@/openldap-mirrormode.ycp +@desktopdir@/openldap-mirrormode.desktop -- 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] r65057 - /branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp
by rhafer＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: rhafer Date: Thu Jul 28 11:59:18 2011 New Revision: 65057 URL: http://svn.opensuse.org/viewcvs/yast?rev=65057&view=rev Log: Only show mirror mode checkbox on sle-ha Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/dialogs.ycp Thu Jul 28 11:59:18 2011 @@ -19,6 +19,7 @@ import "LdapServer"; import "HTML"; import "Report"; +import "Pkg"; include "ldap-server/helps.ycp"; include "ldap-server/tree_structure.ycp"; @@ -34,6 +35,7 @@ **********************/ string error_str = ""; +boolean sourcemanager_started = false; list<map> generateTreeRec( list<map> tree, string parent, list<string> children ) { @@ -1079,6 +1081,22 @@ any MasterSetupDialog() { + if ( ! sourcemanager_started ) + { + Pkg::SourceStartManager(true); + } + list<map<string,any> > products = Pkg::ResolvableProperties ("sle-hae", `product, ""); + boolean allowMirrorMode = false; + if ( size(products) > 0 ) + { + foreach( map<string,any> product, products, { + if ( (symbol)product["status"]:`none == `available ) + { + allowMirrorMode = true; + } + }); + } + y2debug("MirrorMode allowed: %1", allowMirrorMode ); term widget = `HSquash( `VSquash( @@ -1094,7 +1112,9 @@ `Password( `id( `te_valid_rootpw ), `opt( `hstretch ), _("&Validate Password") ), `VSpacing( 0.5 ), `Left( - `CheckBox( `id( `cb_mirror_mode ), _("Prepare for MirrorMode replication (generates the serverId attribute)") ) + `ReplacePoint( `id( `rp_mirrormode ), + `Empty() + ) ) ) ) @@ -1104,6 +1124,12 @@ HELPS["master_setup_dialog"]:"help not found", Label::BackButton(), Label::NextButton() ); + if ( allowMirrorMode ) + { + UI::ReplaceWidget(`rp_mirrormode, + `CheckBox( `id( `cb_mirror_mode ), _("Prepare for MirrorMode replication (generates the serverId attribute)") ) + ); + } any ret = nil; while ( true ) { @@ -1131,7 +1157,10 @@ map <string, any> defaults = LdapServer::CreateInitialDefaults(); defaults["configpw"] = pw; LdapServer::SetInitialDefaults(defaults); - LdapServer::WriteSetupMirrorMode( (boolean)UI::QueryWidget( `cb_mirror_mode, `Value ) ); + if ( allowMirrorMode ) + { + LdapServer::WriteSetupMirrorMode( (boolean)UI::QueryWidget( `cb_mirror_mode, `Value ) ); + } 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] r65056 - in /branches/SuSE-Code-11-SP2-Branch/ldap-server: src/Makefile.am src/openldap-mirrormode.desktop yast2-ldap-server.spec.in
by rhafer＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: rhafer Date: Thu Jul 28 11:59:15 2011 New Revision: 65056 URL: http://svn.opensuse.org/viewcvs/yast?rev=65056&view=rev Log: .desktop file for MirrorMode UI (bnc#708869) Added: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/openldap-mirrormode.desktop Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/ldap-server/yast2-ldap-server.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/Makefile.am Thu Jul 28 11:59:15 2011 @@ -20,7 +20,8 @@ mirrormode-wizard.ycp desktop_DATA = \ - ldap-server.desktop + ldap-server.desktop \ + openldap-mirrormode.desktop module_DATA = \ LdapServer.pm \ Added: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/openldap-mirrormode.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/openldap-mirrormode.desktop (added) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/openldap-mirrormode.desktop Thu Jul 28 11:59:15 2011 @@ -0,0 +1,25 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=openldap-mirrormode + +X-SuSE-YaST-Group=Net_advanced +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst=all +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstClonable=false + +Icon=yast-ldap-server +Exec=/sbin/yast2 openldap-mirrormode + +Name=OpenLDAP MirrorMode +GenericName=Manage OpenLDAP MirrorMode Nodes +X-KDE-SubstituteUID=true +StartupNotify=true Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/yast2-ldap-server.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/yast2-ldap-server.spec.in Thu Jul 28 11:59:15 2011 @@ -34,6 +34,7 @@ @moduledir@/LdapDatabase.* @moduledir@/YaPI/LdapServer.pm @desktopdir@/ldap-server.desktop +@desktopdir@/openldap-mirrormode.desktop @plugindir@/libpy2ag_slapdconfig.* @schemadir@/autoyast/rnc/ldap-server.rnc @scrconfdir@/* -- 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] r65055 - in /branches/SuSE-Linux-11_4-Branch/gtk: VERSION VERSION.cmake package/yast2-gtk.changes src/pkg/YGPackageSelector.cc src/pkg/ygtkpkgmenubar.cc
by rpmcruz＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: rpmcruz Date: Thu Jul 28 07:12:27 2011 New Revision: 65055 URL: http://svn.opensuse.org/viewcvs/yast?rev=65055&view=rev Log: Backport: - don't show unsupported packages when the list is empty (bnc#704103). - showing mnemonics characters (bnc#704102). Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/YGPackageSelector.cc branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/ygtkpkgmenubar.cc Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/VERSION (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/VERSION Thu Jul 28 07:12:27 2011 @@ -1 +1 @@ -2.21.93 +2.21.94 Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake Thu Jul 28 07:12:27 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "93") +SET(VERSION_PATCH "94") Modified: branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/pa… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes Thu Jul 28 07:12:27 2011 @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 28 05:57:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.94 +- don't show unsupported packages when the list is empty +(bnc#704103). +- showing mnemonics characters (bnc#704102). + +------------------------------------------------------------------- Fri Apr 01 00:09:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.93 Modified: branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/YGPackageSelector.cc (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/YGPackageSelector.cc Thu Jul 28 07:12:27 2011 @@ -603,6 +603,13 @@ { return Ypp::Package (sel).support() <= 1; } }; + Ypp::PoolQuery query (Ypp::Selectable::PACKAGE); + query.addCriteria (new Ypp::StatusMatch (Ypp::StatusMatch::TO_MODIFY)); + query.addCriteria (new UnsupportedMatch()); + Ypp::List list (query); + if(list.size() == 0) + return true; + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GtkDialogFlags (0), GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Unsupported packages")); @@ -615,11 +622,6 @@ gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500); - Ypp::PoolQuery query (Ypp::Selectable::PACKAGE); - query.addCriteria (new Ypp::StatusMatch (Ypp::StatusMatch::TO_MODIFY)); - query.addCriteria (new UnsupportedMatch()); - Ypp::List list (query); - YGtkPkgListView view (true, Ypp::List::NAME_SORT, false, true); view.addCheckColumn (INSTALLED_CHECK_PROP); view.addTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); @@ -629,7 +631,7 @@ view.setListener (this); view.setList (list); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), view.getWidget()); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area(GTK_DIALOG (dialog))), view.getWidget()); gtk_widget_show_all (dialog); int ret = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); Modified: branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/ygtkpkgmenubar.cc Thu Jul 28 07:12:27 2011 @@ -745,7 +745,7 @@ append_menu_item (submenu, _("Install All Matching -_devel Packages"), NULL, G_CALLBACK (install_all_devel_pkgs_cb), this); // Translators: keep "-debug-_info" untranslated - append_menu_item (submenu, _("Install All Matching -debug-_sinfo Packages"), NULL, + append_menu_item (submenu, _("Install All Matching -debug-_info Packages"), NULL, G_CALLBACK (install_all_debug_info_pkgs_cb), this); // Translators: keep "-debug-_source" untranslated append_menu_item (submenu, _("Install All Matching -debug-_source Packages"), NULL, -- 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] r65054 - /tags/stable-2_22_0/gtk/
by rpmcruz＠svn2.opensuse.org 28 Jul '11

28 Jul '11

Author: rpmcruz Date: Thu Jul 28 07:02:19 2011 New Revision: 65054 URL: http://svn.opensuse.org/viewcvs/yast?rev=65054&view=rev Log: Created tag stable-2_22_0 for gtk Added: tags/stable-2_22_0/gtk/ - copied from r65053, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0