October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51774 - /tags/stable-2_17_1/nfs-server/
by mvidner＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: mvidner Date: Thu Oct 2 11:13:09 2008 New Revision: 51774 URL: http://svn.opensuse.org/viewcvs/yast?rev=51774&view=rev Log: Created tag stable-2_17_1 for nfs-server Added: tags/stable-2_17_1/nfs-server/ - copied from r51773, trunk/nfs-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] r51773 - in /trunk/nfs-server: ./ package/ src/ testsuite/tests/
by mvidner＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: mvidner Date: Thu Oct 2 11:10:04 2008 New Revision: 51773 URL: http://svn.opensuse.org/viewcvs/yast?rev=51773&view=rev Log: Use rpcbind by default and fall back to portmap (bnc#423026). Modified: trunk/nfs-server/VERSION trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/src/NfsServer.ycp trunk/nfs-server/testsuite/tests/readwrite-unfsd.out trunk/nfs-server/testsuite/tests/readwrite-unfsd.ycp trunk/nfs-server/testsuite/tests/readwrite.out trunk/nfs-server/testsuite/tests/readwrite.ycp trunk/nfs-server/testsuite/tests/readwrite2.out trunk/nfs-server/testsuite/tests/readwrite2.ycp trunk/nfs-server/yast2-nfs-server.spec.in Modified: trunk/nfs-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/VERSION?rev=51773&r1=… ============================================================================== --- trunk/nfs-server/VERSION (original) +++ trunk/nfs-server/VERSION Thu Oct 2 11:10:04 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-ser… ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Thu Oct 2 11:10:04 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 2 11:09:47 CEST 2008 - mvidner(a)suse.cz + +- Use rpcbind by default and fall back to portmap (bnc#423026). +- 2.17.1 + +------------------------------------------------------------------- Mon Sep 8 13:48:46 CEST 2008 - mvidner(a)suse.cz - Applied proofreading changes from Andrew Spackman. Modified: trunk/nfs-server/src/NfsServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/NfsServer.ycp?rev… ============================================================================== --- trunk/nfs-server/src/NfsServer.ycp (original) +++ trunk/nfs-server/src/NfsServer.ycp Thu Oct 2 11:10:04 2008 @@ -214,6 +214,24 @@ return true; } + + string portmapper = nil; + + /** + * Get the used port mapper: since SLE11A3 we have rpcbind + * instead of portmap as the default (bnc#423026) + */ + string Portmapper() { + if (portmapper == nil) { + portmapper = Service::Find(["rpcbind", "portmap"]); + if (portmapper == "") { + y2error("No portmapper found"); + portmapper = "rpcbind"; + } + } + return portmapper; + } + /** * Saves NFS server configuration. (exports(5)) * Creates any missing directories. @@ -302,7 +320,7 @@ } else { - if (! Service::Enable("portmap")) + if (! Service::Enable(Portmapper ())) { Report::Error (Service::Error()); ok = false; @@ -387,10 +405,10 @@ if (!write_only) { - if (Service::Status("portmap") != 0 ) + if (Service::Status(Portmapper ()) != 0 ) { // portmap must not be started if it is running already (see bug # 9999) - Service::Start("portmap"); + Service::Start(Portmapper ()); } Service::Stop("nfsserver"); Modified: trunk/nfs-server/testsuite/tests/readwrite-unfsd.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite-unfsd.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite-unfsd.out Thu Oct 2 11:10:04 2008 @@ -1,12 +1,12 @@ Dump Read Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" false Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Read .init.scripts.exists "SuSEfirewall2_init" true -Read .init.scripts.runlevel "SuSEfirewall2_init" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "SuSEfirewall2_init" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -21,24 +21,25 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "portmap" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "rpcbind" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["network":$["start":["3", "5"], "stop":["3", "5"]], "networkmanager":$["start":[], "stop":[]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "idmapd" true Execute .target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true Modified: trunk/nfs-server/testsuite/tests/readwrite-unfsd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite-unfsd.ycp (original) +++ trunk/nfs-server/testsuite/tests/readwrite-unfsd.ycp Thu Oct 2 11:10:04 2008 @@ -53,14 +53,14 @@ "scripts": $[ "exists": true, "runlevel": $[ - "portmap": service_on, + "rpcbind": service_on, "nfsserver": service_on, "network": service_on, "networkmanager": service_off, ], // their contents is not important for ServiceAdjust "comment": $[ - "portmap": $[], + "rpcbind": $[], "nfsserver": $[], ], ], Modified: trunk/nfs-server/testsuite/tests/readwrite.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite.out Thu Oct 2 11:10:04 2008 @@ -1,12 +1,12 @@ Dump Read Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Read .init.scripts.exists "SuSEfirewall2_init" true -Read .init.scripts.runlevel "SuSEfirewall2_init" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "SuSEfirewall2_init" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -21,29 +21,30 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "portmap" $["nfslock":$[], "nfsserver":$[], "portmap":$[]] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "rpcbind" $["nfslock":$[], "nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfslock" $["nfslock":$[], "nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfslock" $["nfslock":$[], "nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfsserver" $["nfslock":$[], "nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfslock":$["start":["3", "5"], "stop":["3", "5"]], "nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfsserver" $["nfslock":$[], "nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "idmapd" true Execute .target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true Modified: trunk/nfs-server/testsuite/tests/readwrite.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite.ycp (original) +++ trunk/nfs-server/testsuite/tests/readwrite.ycp Thu Oct 2 11:10:04 2008 @@ -53,13 +53,13 @@ "scripts": $[ "exists": true, "runlevel": $[ - "portmap": service_on, + "rpcbind": service_on, "nfsserver": service_on, "nfslock": service_on, ], // their contents is not important for ServiceAdjust "comment": $[ - "portmap": $[], + "rpcbind": $[], "nfsserver": $[], "nfslock": $[], ], Modified: trunk/nfs-server/testsuite/tests/readwrite2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite2.out (original) +++ trunk/nfs-server/testsuite/tests/readwrite2.out Thu Oct 2 11:10:04 2008 @@ -2,13 +2,13 @@ Dump Read - services are running Dump Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil Read .sysconfig.nfs.NFS_SECURITY_GSS nil Read .init.scripts.exists "SuSEfirewall2_init" true -Read .init.scripts.runlevel "SuSEfirewall2_init" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "SuSEfirewall2_init" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -30,16 +30,16 @@ Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Execute .target.bash_output "/sbin/insserv -r /etc/init.d/nfsserver" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "nfslock" true Execute .target.bash "/etc/init.d/nfslock stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -47,7 +47,7 @@ Dump Read - services are running Dump Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil @@ -66,30 +66,31 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "portmap" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "rpcbind" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] Execute .target.bash_output "/sbin/insserv -d /etc/init.d/nfslock" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "portmap":$["start":["3", "5"], "stop":["3", "5"]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":["3", "5"], "stop":["3", "5"]], "rpcbind":$["start":["3", "5"], "stop":["3", "5"]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "idmapd" true Execute .target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true @@ -105,7 +106,7 @@ Dump Read - services are stopped Dump Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil @@ -129,15 +130,15 @@ Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "nfslock" true Execute .target.bash "/etc/init.d/nfslock stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] Read .init.scripts.exists "SuSEfirewall2_init" true Execute .target.bash "/etc/init.d/SuSEfirewall2_init status" $["TERM":"raw"] 0 Return true @@ -145,7 +146,7 @@ Dump Read - services are stopped Dump Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] Read .etc.exports [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]] Read .init.scripts.exists "nfslock" true Read .sysconfig.nfs.NFS4_SUPPORT nil @@ -164,23 +165,23 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.exists "portmap" true -Read .init.scripts.runlevel "portmap" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "portmap" $["nfsserver":$[], "portmap":$[]] -Execute .target.bash_output "/sbin/insserv -d /etc/init.d/portmap" $["exit":0, "stderr":"", "stdout":""] +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.exists "rpcbind" true +Read .init.scripts.runlevel "rpcbind" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "rpcbind" $["nfsserver":$[], "rpcbind":$[]] +Execute .target.bash_output "/sbin/insserv -d /etc/init.d/rpcbind" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true Read .init.scripts.exists "nfslock" true -Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "nfslock" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfslock" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "nfslock" $["nfsserver":$[], "rpcbind":$[]] Execute .target.bash_output "/sbin/insserv -d /etc/init.d/nfslock" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true Read .init.scripts.exists "nfsserver" true -Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "portmap":$["start":[], "stop":[]]] -Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "portmap":$[]] +Read .init.scripts.runlevel "nfsserver" $["nfsserver":$["start":[], "stop":[]], "rpcbind":$["start":[], "stop":[]]] +Read .init.scripts.comment "nfsserver" $["nfsserver":$[], "rpcbind":$[]] Execute .target.bash_output "/sbin/insserv -d /etc/init.d/nfsserver" $["exit":0, "stderr":"", "stdout":""] Read .init.scripts.exists "idmapd" true Execute .target.bash "/etc/init.d/idmapd status" $["TERM":"raw"] 0 @@ -188,8 +189,8 @@ Execute .target.bash "/etc/init.d/svcgssd status" $["TERM":"raw"] 0 Read .init.scripts.exists "svcgssd" true Execute .target.bash "/etc/init.d/svcgssd stop" $["TERM":"raw"] 0 -Read .init.scripts.exists "portmap" true -Execute .target.bash "/etc/init.d/portmap status" $["TERM":"raw"] 0 +Read .init.scripts.exists "rpcbind" true +Execute .target.bash "/etc/init.d/rpcbind status" $["TERM":"raw"] 0 Read .init.scripts.exists "nfsserver" true Execute .target.bash "/etc/init.d/nfsserver stop" $["TERM":"raw"] 0 Read .init.scripts.exists "nfslock" true Modified: trunk/nfs-server/testsuite/tests/readwrite2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/testsuite/tests/readw… ============================================================================== --- trunk/nfs-server/testsuite/tests/readwrite2.ycp (original) +++ trunk/nfs-server/testsuite/tests/readwrite2.ycp Thu Oct 2 11:10:04 2008 @@ -54,12 +54,12 @@ "scripts": $[ "exists": true, "runlevel": $[ - "portmap": service_on, + "rpcbind": service_on, "nfsserver": service_on, ], // their contents is not important for ServiceAdjust "comment": $[ - "portmap": $[], + "rpcbind": $[], "nfsserver": $[], ], ], @@ -87,9 +87,9 @@ map READ2 = READ; READ2["init","scripts","exists"] = false; - // services portmap & nfsserver are stopped + // services rpcbind & nfsserver are stopped map READ3 = READ; - READ3["init","scripts","runlevel","portmap"] = service_off; + READ3["init","scripts","runlevel","rpcbind"] = service_off; READ3["init","scripts","runlevel","nfsserver"] = service_off; map WRITE = $[ @@ -113,7 +113,7 @@ ], ]; - // nfsserver and portmap are running + // nfsserver and rpcbind are running DUMP ("\nRead - services are running\n"); TEST (``(NfsServer::Read ()), [READ, WRITE, EXECUTE], nil); DUMP ("\nWrite - services will be stopped\n"); @@ -122,7 +122,7 @@ // And Write TEST (``(NfsServer::Write ()), [READ, WRITE, EXECUTE], nil); - // nfsserver and portmap are running + // nfsserver and rpcbind are running DUMP ("\nRead - services are running\n"); TEST (``(NfsServer::Read ()), [READ, WRITE, EXECUTE], nil); DUMP ("\nWrite - services are running\n"); @@ -131,7 +131,7 @@ // And Write TEST (``(NfsServer::Write ()), [READ, WRITE, EXECUTE], nil); - // nfsserver and portmap are stopped + // nfsserver and rpcbind are stopped DUMP ("\nRead - services are stopped\n"); TEST (``(NfsServer::Read ()), [READ3, WRITE, EXECUTE], nil); DUMP ("\nWrite - services will be stopped\n"); @@ -140,7 +140,7 @@ // And Write TEST (``(NfsServer::Write ()), [READ3, WRITE, EXECUTE], nil); - // nfsserver and portmap are stopped + // nfsserver and rpcbind are stopped DUMP ("\nRead - services are stopped\n"); TEST (``(NfsServer::Read ()), [READ3, WRITE, EXECUTE], nil); DUMP ("\nWrite - services will be started\n"); Modified: trunk/nfs-server/yast2-nfs-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/yast2-nfs-server.spec… ============================================================================== --- trunk/nfs-server/yast2-nfs-server.spec.in (original) +++ trunk/nfs-server/yast2-nfs-server.spec.in Thu Oct 2 11:10:04 2008 @@ -2,7 +2,8 @@ @HEADER@ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 >= 2.11.11 +# Service::Find +Requires: yast2 >= 2.17.28 Requires: yast2-nfs-common Provides: yast2-config-nfs-server yast2-config-nfs-server-devel -- 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] r51772 - /trunk/yast2/library/runlevel/src/Service.ycp
by mvidner＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: mvidner Date: Thu Oct 2 10:30:33 2008 New Revision: 51772 URL: http://svn.opensuse.org/viewcvs/yast?rev=51772&view=rev Log: documented the corner case for Find Modified: trunk/yast2/library/runlevel/src/Service.ycp Modified: trunk/yast2/library/runlevel/src/Service.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/runlevel/src/Servi… ============================================================================== --- trunk/yast2/library/runlevel/src/Service.ycp (original) +++ trunk/yast2/library/runlevel/src/Service.ycp Thu Oct 2 10:30:33 2008 @@ -520,7 +520,7 @@ /** * Return the first of the list of services which is available - * (has init script) + * (has init script) or "" if none is. * @param list<string> list of service names * @return string the first found service */ -- 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] r51771 - /tags/stable-2_17_17/country/
by jsuchome＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: jsuchome Date: Thu Oct 2 10:00:04 2008 New Revision: 51771 URL: http://svn.opensuse.org/viewcvs/yast?rev=51771&view=rev Log: Created tag stable-2_17_17 for country Added: tags/stable-2_17_17/country/ - copied from r51770, trunk/country/ -- 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] r51770 - in /trunk/country: VERSION language/data/language_nn_NO.ycp language/src/select_language.ycp package/yast2-country.changes timezone/src/dialogs.ycp
by jsuchome＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: jsuchome Date: Thu Oct 2 10:00:00 2008 New Revision: 51770 URL: http://svn.opensuse.org/viewcvs/yast?rev=51770&view=rev Log: - added minimal support for Nynorsk (bnc#426124) - default NTP configuration based on control file value (bnc#431259) - 2.17.17 Added: trunk/country/language/data/language_nn_NO.ycp (with props) Modified: trunk/country/VERSION trunk/country/language/src/select_language.ycp trunk/country/package/yast2-country.changes trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=51770&r1=517… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Oct 2 10:00:00 2008 @@ -1 +1 @@ -2.17.16 +2.17.17 Added: trunk/country/language/data/language_nn_NO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/data/language_n… ============================================================================== --- trunk/country/language/data/language_nn_NO.ycp (added) +++ trunk/country/language/data/language_nn_NO.ycp Thu Oct 2 10:00:00 2008 @@ -0,0 +1,43 @@ +/** + * This file contains the description of the language needed by yast2-country + * module. + * + * Translation of the 'language name' to actual YaST language be must applied + * each time this file is invoked. + * + * If you want to add new language to YaST using a file of this type provided + * by some module different from yast2-country (e.g. in some Add-On Product), + * consider using special textdomain, so it is possible to provide also + * translations of the 'language name' string to all installed languages. + * + * Author: JiÅÃ Suchomel <jsuchome(a)suse.cz> + * $Id$ + */ +{ + textdomain "languages_db"; + + return + $[ + // 1. information for language selection: + // Format is + // <LANG-Code> : [ + // <Language-to-display-UTF8-coded>, + // <Language-to-display-ASCII-coded-if-needed>, + // <LANG modifier used when UTF-8 enconding is selected> + // <LANG modifier used when no UTF-8 enconding is selected> + // <translated Language-to-display-UTF8-coded> ] + // + "nn_NO" : [ + "Nynorsk", + "Nynorsk", + ".UTF-8", + "", + // language name + _("Nynorsk") + ], + // 2. what time zone propose for this language + "timezone" : "Europe/Oslo", + // 3. which keyboard layout propose for this language + "keyboard" : "norwegian", + ]; +} Modified: trunk/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/select_lang… ============================================================================== --- trunk/country/language/src/select_language.ycp (original) +++ trunk/country/language/src/select_language.ycp Thu Oct 2 10:00:00 2008 @@ -561,7 +561,14 @@ else if (ret == `next || (set_default && ret == `language)) { Console::SelectFont (language); - Language::WfmSetLanguage (); + // no yast translation for nn_NO, use nb_NO as a backup + if (language == "nn_NO") + { + y2milestone ("Nynorsk not translated, using Bokmål"); + Language::WfmSetGivenLanguage ("nb_NO"); + } + else + Language::WfmSetLanguage (); } } Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Oct 2 10:00:00 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 1 15:40:41 CEST 2008 - jsuchome(a)suse.cz + +- added minimal support for Nynorsk (bnc#426124) +- default NTP configuration based on control file value (bnc#431259) +- 2.17.17 + +------------------------------------------------------------------- Mon Sep 29 21:57:55 CEST 2008 - jsuchome(a)suse.cz - added Galician language support Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Thu Oct 2 10:00:00 2008 @@ -24,6 +24,7 @@ import "NetworkService"; import "Package"; import "Popup"; + import "ProductFeatures"; import "Service"; import "Stage"; import "Timezone"; @@ -487,7 +488,8 @@ // read NTP status if (first_run && NetworkService::isNetworkRunning() && - !GetInstArgs::going_back()) + !GetInstArgs::going_back() && + ProductFeatures::GetBooleanFeature("globals","default_ntp_setup")==true) { // true by default (fate#303520) ntp_used = true; -- 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] r51769 - in /trunk/support: package/yast2-support.changes src/dialogs.ycp
by mzugec＠svn.opensuse.org 02 Oct '08

02 Oct '08

Author: mzugec Date: Thu Oct 2 09:45:32 2008 New Revision: 51769 URL: http://svn.opensuse.org/viewcvs/yast?rev=51769&view=rev Log: changed Novell Support Center URL Modified: trunk/support/package/yast2-support.changes trunk/support/src/dialogs.ycp Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.ch… ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Thu Oct 2 09:45:32 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 2 09:44:49 CEST 2008 - mzugec(a)suse.cz + +- changed Novell Support Center URL + +------------------------------------------------------------------- Mon Sep 29 15:37:11 CEST 2008 - mzugec(a)suse.cz - added support for new identifiers (fate#305243) Modified: trunk/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/dialogs.ycp?rev=5176… ============================================================================== --- trunk/support/src/dialogs.ycp (original) +++ trunk/support/src/dialogs.ycp Thu Oct 2 09:45:32 2008 @@ -101,7 +101,7 @@ break; else if (ret == `browser){ - string url="www.novell.com"; + string url="http://www.novell.com/center/eservice"; y2milestone("Executing browser %1 with URL %2", Support::browser, url); SCR::Execute(.target.bash, sformat("su $(env|grep LOGNAME|cut -d'=' -f2-) -c \"%1 %2\"", Support::browser, url)); } -- 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] r51768 - in /trunk/packager/src: clients/repositories.ycp include/repositories_include.ycp
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 18:40:39 2008 New Revision: 51768 URL: http://svn.opensuse.org/viewcvs/yast?rev=51768&view=rev Log: - display new added services Modified: trunk/packager/src/clients/repositories.ycp trunk/packager/src/include/repositories_include.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Oct 1 18:40:39 2008 @@ -745,6 +745,7 @@ string _msg1 = _("Unable to save changes to the repository configuration."); string details = Pkg::LastError(); + y2milestone("LastError: %1", details); // popup message part 2 followed by other info string _msg2 = details != "" ? (_("Details:") + "\n" + details) : ""; Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Wed Oct 1 18:40:39 2008 @@ -84,6 +84,20 @@ } Pkg::ServiceAdd(alias, url); + + boolean autorefresh = true; + string schema = tolower(substring(url, 0, 3)); + + if (schema == "cd:" || schema == "dvd") + { + autorefresh = false; + y2milestone("Disabling autorefresh for a CD/DVD service"); + } + + serviceStatesOut = add(serviceStatesOut, + $["alias":alias, "autorefresh":autorefresh, "enabled":true, "name":preffered_name, "url":url] + ); + return `ok; } -- 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] r51767 - in /trunk/pkg-bindings/src: Service.cc ServiceManager.cc ServiceManager.h Source_Get.cc Source_Load.cc
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 18:39:48 2008 New Revision: 51767 URL: http://svn.opensuse.org/viewcvs/yast?rev=51767&view=rev Log: - fixed exception handling in Pkg::Service*() functions, the description the exceptions can be read using Pkg::LastError() Modified: trunk/pkg-bindings/src/Service.cc trunk/pkg-bindings/src/ServiceManager.cc trunk/pkg-bindings/src/ServiceManager.h trunk/pkg-bindings/src/Source_Get.cc trunk/pkg-bindings/src/Source_Load.cc Modified: trunk/pkg-bindings/src/Service.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Service.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Service.cc (original) +++ trunk/pkg-bindings/src/Service.cc Wed Oct 1 18:39:48 2008 @@ -74,8 +74,9 @@ return YCPBoolean(service_manager.AddService(alias->value(), url->value())); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); @@ -99,8 +100,9 @@ return YCPBoolean(service_manager.RemoveService(alias->value())); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); @@ -209,8 +211,9 @@ return YCPBoolean(service_manager.SetService(old_alias->value(), s)); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); @@ -226,10 +229,12 @@ try { zypp::RepoManager repomanager = CreateRepoManager(); - return YCPBoolean(service_manager.SaveServices(repomanager)); + service_manager.SaveServices(repomanager); + return YCPBoolean(true); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); @@ -245,10 +250,12 @@ try { zypp::RepoManager repomanager = CreateRepoManager(); - return YCPBoolean(service_manager.LoadServices(repomanager)); + service_manager.LoadServices(repomanager); + return YCPBoolean(true); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); @@ -273,8 +280,9 @@ zypp::RepoManager repomanager = CreateRepoManager(); return YCPBoolean(service_manager.RefreshService(alias->value(), repomanager)); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); } return YCPBoolean(false); @@ -309,8 +317,9 @@ const zypp::RepoManager repomanager = CreateRepoManager(); return YCPString(service_manager.Probe(zypp::Url(url->asString()->value()), repomanager)); } - catch(...) + catch (const zypp::Exception& excpt) { + _last_error.setLastError(ExceptionAsString(excpt)); return YCPVoid(); } } Modified: trunk/pkg-bindings/src/ServiceManager.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ServiceManager.… ============================================================================== --- trunk/pkg-bindings/src/ServiceManager.cc (original) +++ trunk/pkg-bindings/src/ServiceManager.cc Wed Oct 1 18:39:48 2008 @@ -32,107 +32,69 @@ { } -bool ServiceManager::LoadServices(const zypp::RepoManager &repomgr) +void ServiceManager::LoadServices(const zypp::RepoManager &repomgr) { - bool ret = true; - if (!_services_loaded) { - try - { - for_ (it, repomgr.serviceBegin(), repomgr.serviceEnd()) - { - // set the original alias to the current one - PkgService s(*it, it->alias()); - y2milestone("Loaded service %s (%s)", s.alias().c_str(), s.url().asString().c_str()); - _known_services.insert(std::make_pair(s.alias(), s)); - } - - _services_loaded = true; - } - catch(...) + for_ (it, repomgr.serviceBegin(), repomgr.serviceEnd()) { - ret = false; + // set the original alias to the current one + PkgService s(*it, it->alias()); + y2milestone("Loaded service %s (%s)", s.alias().c_str(), s.url().asString().c_str()); + _known_services.insert(std::make_pair(s.alias(), s)); } + + _services_loaded = true; } else { y2warning("Services have already been loaded, skipping load"); } - - return ret; } -bool ServiceManager::SaveServices(zypp::RepoManager &repomgr) const +void ServiceManager::SaveServices(zypp::RepoManager &repomgr) const { - bool ret = true; - for_ (it, _known_services.begin(), _known_services.end()) { std::string alias(it->second.alias()); - try - { // delete if (it->second.isDeleted()) { y2milestone("Removing service %s", alias.c_str()); repomgr.removeService(alias); } - } - catch(...) - { - y2error("Cannot delete service %s", alias.c_str()); - ret = false; - } } for_ (it, _known_services.begin(), _known_services.end()) { std::string alias(it->second.alias()); - try + // save + if (!it->second.isDeleted()) { - // save - if (!it->second.isDeleted()) + if (it->second != repomgr.getService(alias)) { - if (it->second != repomgr.getService(alias)) - { - y2milestone("Saving modified service %s", alias.c_str()); - // FIXME use old alias - repomgr.modifyService(alias, it->second); - } + y2milestone("Saving modified service %s", alias.c_str()); + // FIXME use old alias + repomgr.modifyService(alias, it->second); } } - catch(...) - { - y2error("Cannot save service %s", alias.c_str()); - ret = false; - } } - - return ret; } bool ServiceManager::RefreshService(const std::string &alias, zypp::RepoManager &repomgr) { - try - { - PkgServices::iterator serv_it = _known_services.find(alias); - - if (serv_it == _known_services.end()) - { - y2error("Service '%s' does not exist", alias.c_str()); - return false; - } + PkgServices::iterator serv_it = _known_services.find(alias); - repomgr.refreshService(serv_it->second); - return true; - } - catch(...) + if (serv_it == _known_services.end()) { + y2error("Service '%s' does not exist", alias.c_str()); return false; } + + repomgr.refreshService(serv_it->second); + return true; } ServiceManager::Services ServiceManager::GetServices() const @@ -153,84 +115,68 @@ bool ServiceManager::AddService(const std::string &alias, const std::string &url) { - try + if (alias.empty()) { - if (alias.empty()) - { - y2error("Empty alias for service %s", url.c_str()); - return false; - } + y2error("Empty alias for service %s", url.c_str()); + return false; + } - PkgServices::iterator serv_it = _known_services.find(alias); - std::string orig_alias; + PkgServices::iterator serv_it = _known_services.find(alias); + std::string orig_alias; - if (serv_it != _known_services.end()) + if (serv_it != _known_services.end()) + { + if (serv_it->second.isDeleted()) { - if (serv_it->second.isDeleted()) - { - // remember the original alias - // adding a removed service is the same as changing existing one - orig_alias = serv_it->second.alias(); - - // we are adding an already removed service, - // remove the existing service - _known_services.erase(serv_it); - } - else - { - y2error("Service with alias %s already exists", alias.c_str()); - return false; - } + // remember the original alias + // adding a removed service is the same as changing existing one + orig_alias = serv_it->second.alias(); + + // we are adding an already removed service, + // remove the existing service + _known_services.erase(serv_it); } + else + { + y2error("Service with alias %s already exists", alias.c_str()); + return false; + } + } - zypp::ServiceInfo info; - info.setAlias(alias); - info.setUrl(url); + zypp::ServiceInfo info; + info.setAlias(alias); + info.setUrl(url); - PkgService srv(info, orig_alias); + PkgService srv(info, orig_alias); - _known_services.insert(std::make_pair(alias, srv)); - } - catch(...) - { - return false; - } + _known_services.insert(std::make_pair(alias, srv)); return true; } bool ServiceManager::RemoveService(const std::string &alias) { - try - { - PkgServices::iterator serv_it = _known_services.find(alias); + PkgServices::iterator serv_it = _known_services.find(alias); - if (serv_it != _known_services.end()) + if (serv_it != _known_services.end()) + { + if (serv_it->second.isDeleted()) { - if (serv_it->second.isDeleted()) - { - y2warning("Service %s has been already removed", alias.c_str()); - return true; - } - else - { - serv_it->second.setDeleted(); - y2milestone("Service %s has been marked as deleted", alias.c_str()); - return true; - } + y2warning("Service %s has been already removed", alias.c_str()); + return true; } else { - y2error("Service %s does not exist", alias.c_str()); - return false; + serv_it->second.setDeleted(); + y2milestone("Service %s has been marked as deleted", alias.c_str()); + return true; } } - catch(...) + else { + y2error("Service %s does not exist", alias.c_str()); return false; } - - return true; } void ServiceManager::Reset() @@ -244,30 +190,24 @@ zypp::ServiceInfo ServiceManager::GetService(const std::string &alias) const { - try - { - PkgServices::const_iterator serv_it = _known_services.find(alias); + PkgServices::const_iterator serv_it = _known_services.find(alias); - if (serv_it != _known_services.end()) + if (serv_it != _known_services.end()) + { + if (serv_it->second.isDeleted()) { - if (serv_it->second.isDeleted()) - { - y2warning("Service %s has been removed", alias.c_str()); - return zypp::ServiceInfo::noService; - } - else - { - return serv_it->second; - } + y2warning("Service %s has been removed", alias.c_str()); + return zypp::ServiceInfo::noService; } else { - y2error("Service %s does not exist", alias.c_str()); - return zypp::ServiceInfo::noService; + return serv_it->second; } } - catch(...) + else { + y2error("Service %s does not exist", alias.c_str()); + return zypp::ServiceInfo::noService; } return zypp::ServiceInfo::noService; @@ -275,43 +215,37 @@ bool ServiceManager::SetService(const std::string old_alias, const zypp::ServiceInfo &srv) { - try - { - PkgServices::const_iterator serv_it = _known_services.find(old_alias); + PkgServices::const_iterator serv_it = _known_services.find(old_alias); - if (serv_it != _known_services.end()) + if (serv_it != _known_services.end()) + { + if (serv_it->second.isDeleted()) + { + y2warning("Service %s has been removed", old_alias.c_str()); + return false; + } + else { - if (serv_it->second.isDeleted()) + // if the alias has been already changed then keep the original alias + if (old_alias == serv_it->second.alias() ) { - y2warning("Service %s has been removed", old_alias.c_str()); - return false; + PkgService s(srv, old_alias); + _known_services[srv.alias()] = s; } else { - // if the alias has been already changed then keep the original alias - if (old_alias == serv_it->second.alias() ) - { - PkgService s(srv, old_alias); - _known_services[srv.alias()] = s; - } - else - { - // keep the old alias - PkgService s(srv, serv_it->second.origAlias()); - _known_services[srv.alias()] = s; - } - - return true; + // keep the old alias + PkgService s(srv, serv_it->second.origAlias()); + _known_services[srv.alias()] = s; } - } - else - { - y2error("Service %s does not exist", old_alias.c_str()); - return false; + + return true; } } - catch(...) + else { + y2error("Service %s does not exist", old_alias.c_str()); + return false; } return false; Modified: trunk/pkg-bindings/src/ServiceManager.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/ServiceManager.… ============================================================================== --- trunk/pkg-bindings/src/ServiceManager.h (original) +++ trunk/pkg-bindings/src/ServiceManager.h Wed Oct 1 18:39:48 2008 @@ -40,9 +40,9 @@ Services GetServices() const; - bool LoadServices(const zypp::RepoManager &repomgr); + void LoadServices(const zypp::RepoManager &repomgr); - bool SaveServices(zypp::RepoManager &repomgr) const; + void SaveServices(zypp::RepoManager &repomgr) const; bool AddService(const std::string &alias, const std::string &url); Modified: trunk/pkg-bindings/src/Source_Get.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Get.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Source_Get.cc (original) +++ trunk/pkg-bindings/src/Source_Get.cc Wed Oct 1 18:39:48 2008 @@ -370,8 +370,10 @@ * source priority (highest first). A source state is a map: * $[ * "SrcId" : YCPInteger, - * "enabled" : YCPBoolean - * "autorefresh": YCPBoolean + * "enabled" : YCPBoolean, + * "autorefresh": YCPBoolean, + * "name" : YCPString, + * "service" : YCPString * ]; * * @return list<map> list of source states (map) @@ -395,6 +397,7 @@ src_map->add(YCPString("autorefresh"), YCPBoolean((*it)->repoInfo().autorefresh())); src_map->add(YCPString("name"), YCPString((*it)->repoInfo().name())); src_map->add(YCPString("priority"), YCPInteger((*it)->repoInfo().priority())); + src_map->add(YCPString("service"), YCPString((*it)->repoInfo().service())); ret->add(src_map); } Modified: trunk/pkg-bindings/src/Source_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Load.cc?… ============================================================================== --- trunk/pkg-bindings/src/Source_Load.cc (original) +++ trunk/pkg-bindings/src/Source_Load.cc Wed Oct 1 18:39:48 2008 @@ -52,6 +52,7 @@ YCPValue PkgFunctions::SourceRestore() { + if (repos.size() > 0) { y2warning("Number of registered repositories: %zd, skipping repository load!", repos.size()); @@ -495,7 +496,7 @@ } /**************************************************************************************** - * @builtin SourceCleanupBroken + * @builtin SourceCleanupBroken - obsoleted, do not use! * * @short Clean up all sources that were not properly restored on the last * call of SourceStartManager or SourceStartCache. -- 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] r51766 - /trunk/storage/storage/src/include/ep-dialogs.ycp
by kmachalkova＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: kmachalkova Date: Wed Oct 1 17:51:26 2008 New Revision: 51766 URL: http://svn.opensuse.org/viewcvs/yast?rev=51766&view=rev Log: Be more user-friendly Modified: trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Oct 1 17:51:26 2008 @@ -498,12 +498,12 @@ if (flavour == `part) { //FIXME: add special case for Windows part. - used = _("Space\nUsed\n%1 ") + unit; + used = _("Used\nSpace\n%1 ") + unit; if ( Partitions::IsSwapPartition( fsid ) ) free = _("Swap\nSpace\n%1 ") + unit; else - free = _("Space\nFree\n%1 ") + unit; + free = _("Free\nSpace\n%1 ") + unit; available = _("Unused\nDisk\n%1 ") + unit; } @@ -520,6 +520,14 @@ return [ used, free, available ]; } + string FreeSpaceLabel() + { + if ( Partitions::IsSwapPartition( fsid ) ) + return _("Swap Space"); + else + return _("Remaining Free Space"); + } + if (flavour == `part) { @@ -574,14 +582,15 @@ { content = `VBox( `BarGraph(`id(`graph), `opt(`vstretch), [used, free, av_space], BarGraphLabels() ), - `Slider(`id(`new_size), `opt(`notify), sformat(_("New Size (in %1)"), unit), used+min_free, + `Slider(`id(`new_size), `opt(`notify), sformat(_("New Partition Size (in %1)"), unit), used+min_free, used + free + av_space, used+free) ); } + //FIXME: something nicer for ncurses, this layout sucks - #410956 else { content = `Frame("", - `IntField(`id(`new_size), `opt(`notify), sformat(_("New Size (in %1)"), unit), + `IntField(`id(`new_size), `opt(`notify), sformat(_("New Partition Size (in %1)"), unit), used + min_free, used + free + av_space, used + free) ); @@ -592,33 +601,40 @@ `Left(`Heading(heading)), `HSpacing(60), content, - `Left(`Label( `id(`free), sformat(_("Free Space Remaining: %1 MB"), free ))), + `Left(`Label( `id(`free), sformat("%1: %2 %3", FreeSpaceLabel(), free, unit ))), `VSpacing(1.0), `Left(`Label( sformat(_("Minimum Partition Size: %1 %2"), used + min_free, unit ))), `Left(`Label( sformat(_("Maximum Partition Size: %1 %2"), total, unit ))), `HBox( - `HStretch(), - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), `opt(`default), Label::OKButton()) - ) + `ButtonBox( + `PushButton(`id(`help), Label::HelpButton()), + `PushButton(`id(`cancel), `opt(`cancelButton), Label::CancelButton()), + `PushButton(`id(`ok), `opt(`default, `okButton), Label::OKButton()) + ) + ) ) ); any widget = nil; - integer new_size = -1; integer old_size = used + free; + integer new_size = old_size; do { widget = UI::UserInput(); switch ( (symbol) widget) { + case `help: + { + Popup::LongText(_("Partition Resizing"), `RichText("To-Do: Let's get outta here"), 50, 20); + break; + } case `new_size: { new_size = (integer) UI::QueryWidget(`id(`new_size), `Value); integer new_free = new_size - used ; UI::ChangeWidget(`id(`graph), `Values, [ used, new_free, total - (new_free + used) ]); - UI::ChangeWidget(`id(`free), `Value, sformat(_("Free Space Remaining: %1 %2"), new_free, unit)); + UI::ChangeWidget(`id(`free), `Value, sformat("%1: %2 %3", FreeSpaceLabel(), new_free, unit)); break; } case `ok: -- 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] r51765 - /trunk/packager/src/clients/repositories.ycp
by lslezak＠svn.opensuse.org 01 Oct '08

01 Oct '08

Author: lslezak Date: Wed Oct 1 17:17:00 2008 New Revision: 51765 URL: http://svn.opensuse.org/viewcvs/yast?rev=51765&view=rev Log: - fixed multi refresh Modified: trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Oct 1 17:17:00 2008 @@ -139,8 +139,6 @@ map generalData = Pkg::SourceGeneralData( id ); y2milestone("generalData(%1): %2", id, generalData); - y2internal("Item: %1", source); - string name = repository_mode ? (haskey(source, "name") ? source["name"]:"" : // unkown name (alias) of the source @@ -214,8 +212,6 @@ if (repo_mode && service_name != "") { itemList = ReposFromService(service_name, itemList); - - y2internal("table items: %1", itemList); } integer numItems = size(itemList); @@ -226,7 +222,7 @@ i = i + 1; } - y2internal("New table content: %1", items); + y2milestone("New table content: %1", items); UI::ChangeWidget( `id( `table ), `Items, items ); } @@ -263,10 +259,8 @@ void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name) { - y2internal(-1, "fillRepoInfo: index: %1, source; %2, repo_mode: %3, service_name: %4", - index, source, repo_mode, service_name); map<string,any> info = repo_mode ? getSourceInfo (index, source) : source; - y2internal("getSourceInfo(%1, %2): %3", index, source, info); + y2milestone("getSourceInfo(%1, %2): %3", index, source, info); // heading - in case repo name not found string name = info["name"]:_("Unknown repository name"); @@ -800,7 +794,7 @@ any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); // rebuild the dialog if needed - y2internal("Current tree item: %1", current_item); + y2milestone("Current tree item: %1", current_item); boolean update_table_widget = false; if (current_item == `repositories) @@ -1016,10 +1010,10 @@ else { // refresh a service - string service_name = (serviceStatesOut[current]:$[])["name"]:""; + string service_alias = (serviceStatesOut[current]:$[])["alias"]:""; - y2milestone("Refreshing service %1...", service_name); - Pkg::ServiceRefresh(service_name); + y2milestone("Refreshing service %1...", service_alias); + Pkg::ServiceRefresh(service_alias); } } else if ( input == `autorefresh_all || input == `refresh_enabled) @@ -1031,13 +1025,19 @@ boolean refresh_autorefresh_only = input == `autorefresh_all; integer to_refresh = 0; -// TODO FIXME list<map<string,any> > data = + list<map<string,any> > data = (repository_view) ? + (displayed_service == "" ? sourceStatesOut : ReposFromService(displayed_service, sourceStatesOut)) + : serviceStatesOut; + + y2internal("data: %1", data); - foreach(map<string,any> src_state, sourceStatesOut, + foreach(map<string,any> src_state, data, { if (src_state["enabled"]:false && (!refresh_autorefresh_only || src_state["autorefresh"]:false)) { - string url = Pkg::SourceGeneralData(src_state["SrcId"]:-1)["url"]:""; + string url = repository_view ? + (Pkg::SourceGeneralData(src_state["SrcId"]:-1)["url"]:"") + : src_state["url"]:""; string schema = tolower(substring(url, 0, 3)); if (schema != "cd:" && schema != "dvd") @@ -1048,45 +1048,60 @@ } ); - y2milestone("%1 repositories will be refreshed", to_refresh); + y2milestone("%1 %2 will be refreshed", to_refresh, repository_view ? "repositories" : "services"); if (to_refresh > 0) { Wizard::CreateDialog (); // TODO: add help text - Progress::New(_("Refreshing Repositories"), "", to_refresh + 1, [ _("Refresh Repositories") ], [], ""); + Progress::New(repository_view ? _("Refreshing Repositories") : _("Refreshing Services"), + "", to_refresh + 1, [ repository_view ? _("Refresh Repositories") : _("Refresh Services") ], + [], ""); - foreach(map<string,any> src_state, sourceStatesOut, + foreach(map<string,any> src_state, data, { if (src_state["enabled"]:false && (!refresh_autorefresh_only || src_state["autorefresh"]:false)) { - integer srcid = src_state["SrcId"]:-1; string name = src_state["name"]:""; + if (repository_view) + { + integer srcid = src_state["SrcId"]:-1; - string url = Pkg::SourceGeneralData(src_state["SrcId"]:-1)["url"]:""; - string schema = tolower(substring(url, 0, 3)); + string url = Pkg::SourceGeneralData(src_state["SrcId"]:-1)["url"]:""; + string schema = tolower(substring(url, 0, 3)); - if (schema != "cd:" && schema != "dvd") - { - y2milestone("Autorefreshing repository %1 (%2)", srcid, name); + if (schema != "cd:" && schema != "dvd") + { + y2milestone("Autorefreshing repository %1 (%2)", srcid, name); - // progress bar label - Progress::Title(sformat(_("Refreshing Repository %1..."), name)); + // progress bar label + Progress::Title(sformat(_("Refreshing Repository %1..."), name)); + + Pkg::SourceRefreshNow(srcid); - Pkg::SourceRefreshNow(srcid); + if (full_mode && src_state["enabled"]:false) + { + // force loading of the resolvables + Pkg::SourceSetEnabled(srcid, false); + Pkg::SourceSetEnabled(srcid, true); + } - if (full_mode && src_state["enabled"]:false) + Progress::NextStep(); + } + else { - // force loading of the resolvables - Pkg::SourceSetEnabled(srcid, false); - Pkg::SourceSetEnabled(srcid, true); + y2milestone("Skipping a CD/DVD repository %1 (%2)", srcid, name); } - - Progress::NextStep(); } else { - y2milestone("Skipping a CD/DVD repository %1 (%2)", srcid, name); + string service_alias = src_state["alias"]:""; + + // refreshing services + // progress bar label + Progress::Title(sformat(_("Refreshing Service %1..."), name)); + y2milestone("Refreshing service %1 (alias: %2)...", name, service_alias); + Pkg::ServiceRefresh(service_alias); } } } @@ -1141,23 +1156,19 @@ } else { - if (displayed_service == "") - { - map<string,any> srv = serviceStatesOut[current]:$[]; - y2internal("Selected service: %1", srv); + map<string,any> srv = serviceStatesOut[current]:$[]; + y2milestone("Selected service: %1", srv); - boolean state = srv["enabled"]:false; - state = !state; + boolean state = srv["enabled"]:false; + state = !state; - // update the table - string newstate = ( state ? UI::Glyph (`CheckMark) : ""); - UI::ChangeWidget( `id( `table ), `Item( current, 0 ), newstate ); - - // store the change - srv["enabled"] = state; - serviceStatesOut[current] = srv; - } - // TODO else... + // update the table + string newstate = ( state ? UI::Glyph (`CheckMark) : ""); + UI::ChangeWidget( `id( `table ), `Item( current, 0 ), newstate ); + + // store the change + srv["enabled"] = state; + serviceStatesOut[current] = srv; } } else if ( input == `autorefresh) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0