November 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66963 - in /trunk/wagon: ./ package/ src/modules/ testsuite/ testsuite/tests/
by lslezak＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: lslezak Date: Fri Nov 25 19:37:32 2011 New Revision: 66963 URL: http://svn.opensuse.org/viewcvs/yast?rev=66963&view=rev Log: - fixed registration status check when there is only one product installed (bnc#732813) - 2.22.1 - added tests Added: trunk/wagon/testsuite/tests/Wagon_test.err trunk/wagon/testsuite/tests/Wagon_test.out trunk/wagon/testsuite/tests/Wagon_test.ycp trunk/wagon/testsuite/tests/registration-1product.xml trunk/wagon/testsuite/tests/registration-2products.xml trunk/wagon/testsuite/tests/registration-error.xml trunk/wagon/testsuite/tests/registration-expired.xml Modified: trunk/wagon/VERSION trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp trunk/wagon/testsuite/Makefile.am Modified: trunk/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=66963&r1=66962… ============================================================================== --- trunk/wagon/VERSION (original) +++ trunk/wagon/VERSION Fri Nov 25 19:37:32 2011 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Fri Nov 25 19:37:32 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 25 16:15:24 UTC 2011 - lslezak(a)suse.cz + +- fixed registration status check when there is only one product + installed (bnc#732813) +- 2.22.1 + +------------------------------------------------------------------- Wed Nov 16 11:47:43 CET 2011 - jsuchome(a)suse.cz - merged texts from proofreading Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Fri Nov 25 19:37:32 2011 @@ -864,7 +864,9 @@ map status = RegistrationStatus::ReadFile(file); timestamp = tointeger(status["generated"]:"-1"); - list<map> products = status["productstatus"]:[]; + + any read_products = status["productstatus"]:nil; + list<map> products = is(read_products, map) ? [ (map)read_products ] : (list<map>)read_products; // check each product foreach(map product, products, Modified: trunk/wagon/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/testsuite/Makefile.am?rev=… ============================================================================== --- trunk/wagon/testsuite/Makefile.am (original) +++ trunk/wagon/testsuite/Makefile.am Fri Nov 25 19:37:32 2011 @@ -5,7 +5,7 @@ # AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.xml) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite Added: trunk/wagon/testsuite/tests/Wagon_test.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/testsuite/tests/Wagon_test… ============================================================================== (empty) Added: trunk/wagon/testsuite/tests/Wagon_test.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/testsuite/tests/Wagon_test… ============================================================================== --- trunk/wagon/testsuite/tests/Wagon_test.out (added) +++ trunk/wagon/testsuite/tests/Wagon_test.out Fri Nov 25 19:37:32 2011 @@ -0,0 +1,21 @@ +Read .target.tmpdir "/tmp" +Read .target.stat "/y2update/control.xml" $["isreg":true] +Read .target.size "/y2update/control.xml" 1 +Read .xml "/y2update/control.xml" $[] +Read .sysconfig.console.CONSOLE_ENCODING "UTF-8" +Execute .target.bash_output "locale -k charmap" $["exit":0, "stdout":"charmap=\"UTF-8\"\n"] +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .target.size "/etc/sysconfig/language" 1 +Read .sysconfig.language.ROOT_USES_LANG "ctype" +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .sysconfig.language.INSTALLED_LANGUAGES "" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Read .target.size "tests/registration-1product.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-2products.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES", "sle-slms"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-expired.xml" 1 +Return $["expired":["sle-slms"], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-error.xml" 1 +Return $["expired":[], "failed":["SUSE_SLES", "sle-slms"], "no_subscription":[], "provisional":[], "registered":[], "registered_system":true, "rma":[], "timestamp":1279715826] Added: trunk/wagon/testsuite/tests/Wagon_test.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/testsuite/tests/Wagon_test… ============================================================================== --- trunk/wagon/testsuite/tests/Wagon_test.ycp (added) +++ trunk/wagon/testsuite/tests/Wagon_test.ycp Fri Nov 25 19:37:32 2011 @@ -0,0 +1,57 @@ +/** + * Testsuite for Wagon.ycp module + * + */ + +{ + +include "testsuite.ycp"; + +// huh, we need to mock too much paths because of some module constructor... :-( +map READ = $[ + "target" : $[ + "tmpdir" : "/tmp", + "size" : 1, + "stat" : $["isreg": true], + "string" : "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" + ], + "xml" : $[], + "sysconfig" : $[ + "language" : $[ + "RC_LANG" : "en_US.UTF-8", + "ROOT_USES_LANG" : "ctype", + "RC_LANG" : "en_US.UTF-8", + "INSTALLED_LANGUAGES" : "" + ], + "console" : $[ + "CONSOLE_ENCODING" : "UTF-8" + ] + ] +]; + +map EXEC = $[ + "target" : $[ + "bash_output" : $[ "exit" : 0, "stdout" : "charmap=\"UTF-8\"\n"] + ] +]; + +TESTSUITE_INIT ([READ, $[], EXEC], nil); + +import "Wagon"; + +// check parsing registration status file + +// one registered product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-1product.xml")), [[READ], [], []], 0); + +// two registered products +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-2products.xml")), [[READ], [], []], 0); + +// one expired product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-expired.xml")), [[READ], [], []], 0); + +// failed registration +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-error.xml")), [[READ], [], []], 0); + + +} Added: trunk/wagon/testsuite/tests/registration-1product.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/testsuite/tests/registrati… ============================================================================== --- trunk/wagon/testsuite/tests/registration-1product.xml (added) +++ trunk/wagon/testsuite/tests/registration-1product.xml Fri Nov 25 19:37:32 2011 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> Added: trunk/wagon/testsuite/tests/registration-2products.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/testsuite/tests/registrati… ============================================================================== --- trunk/wagon/testsuite/tests/registration-2products.xml (added) +++ trunk/wagon/testsuite/tests/registration-2products.xml Fri Nov 25 19:37:32 2011 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> Added: trunk/wagon/testsuite/tests/registration-error.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/testsuite/tests/registrati… ============================================================================== --- trunk/wagon/testsuite/tests/registration-error.xml (added) +++ trunk/wagon/testsuite/tests/registration-error.xml Fri Nov 25 19:37:32 2011 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1279715826"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Linux Enterprise Server 11 SP1 was provided.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Lifecycle Management Server 1.0 was provided.</message> + </productstatus> +</status> Added: trunk/wagon/testsuite/tests/registration-expired.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/testsuite/tests/registrati… ============================================================================== --- trunk/wagon/testsuite/tests/registration-expired.xml (added) +++ trunk/wagon/testsuite/tests/registration-expired.xml Fri Nov 25 19:37:32 2011 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_SUB_EXP"> + <subscription status="EXPIRED" expiration="1280302484" type="EVALUATION"/> + <message>The subscription for SUSE Lifecycle Management Server 1.0 is expired.</message> + </productstatus> +</status> -- 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] r66962 - in /branches/SuSE-Code-11-SP1-Branch/wagon: ./ package/ src/modules/ testsuite/ testsuite/tests/
by lslezak＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: lslezak Date: Fri Nov 25 19:20:26 2011 New Revision: 66962 URL: http://svn.opensuse.org/viewcvs/yast?rev=66962&view=rev Log: - fixed registration status check when there is only one product installed (bnc#732813) - 2.17.17.4 - added tests Added: branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.err branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.out branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.ycp branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-1product.xml branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-2products.xml branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-error.xml branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-expired.xml Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/Makefile.am Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Fri Nov 25 19:20:26 2011 @@ -1 +1 @@ -2.17.17.3 +2.17.17.4 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Fri Nov 25 19:20:26 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 25 16:15:24 UTC 2011 - lslezak(a)suse.cz + +- fixed registration status check when there is only one product + installed (bnc#732813) +- 2.17.17.4 + +------------------------------------------------------------------- Thu Nov 3 15:55:33 UTC 2011 - lslezak(a)suse.cz - display "Registration Code" checkbox in the registration step Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Fri Nov 25 19:20:26 2011 @@ -861,7 +861,9 @@ map status = RegistrationStatus::ReadFile(file); timestamp = tointeger(status["generated"]:"-1"); - list<map> products = status["productstatus"]:[]; + + any read_products = status["productstatus"]:nil; + list<map> products = is(read_products, map) ? [ (map)read_products ] : (list<map>)read_products; // check each product foreach(map product, products, Modified: branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/Makefile.am Fri Nov 25 19:20:26 2011 @@ -5,7 +5,7 @@ # AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.xml) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite Added: branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.out (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.out Fri Nov 25 19:20:26 2011 @@ -0,0 +1,21 @@ +Read .target.tmpdir "/tmp" +Read .target.stat "/y2update/control.xml" $["isreg":true] +Read .target.size "/y2update/control.xml" 1 +Read .xml "/y2update/control.xml" $[] +Read .sysconfig.console.CONSOLE_ENCODING "UTF-8" +Execute .target.bash_output "locale -k charmap" $["exit":0, "stdout":"charmap=\"UTF-8\"\n"] +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .target.size "/etc/sysconfig/language" 1 +Read .sysconfig.language.ROOT_USES_LANG "ctype" +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .sysconfig.language.INSTALLED_LANGUAGES "" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Read .target.size "tests/registration-1product.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-2products.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES", "sle-slms"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-expired.xml" 1 +Return $["expired":["sle-slms"], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-error.xml" 1 +Return $["expired":[], "failed":["SUSE_SLES", "sle-slms"], "no_subscription":[], "provisional":[], "registered":[], "registered_system":true, "rma":[], "timestamp":1279715826] Added: branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/Wagon_test.ycp Fri Nov 25 19:20:26 2011 @@ -0,0 +1,57 @@ +/** + * Testsuite for Wagon.ycp module + * + */ + +{ + +include "testsuite.ycp"; + +// huh, we need to mock too much paths because of some module constructor... :-( +map READ = $[ + "target" : $[ + "tmpdir" : "/tmp", + "size" : 1, + "stat" : $["isreg": true], + "string" : "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" + ], + "xml" : $[], + "sysconfig" : $[ + "language" : $[ + "RC_LANG" : "en_US.UTF-8", + "ROOT_USES_LANG" : "ctype", + "RC_LANG" : "en_US.UTF-8", + "INSTALLED_LANGUAGES" : "" + ], + "console" : $[ + "CONSOLE_ENCODING" : "UTF-8" + ] + ] +]; + +map EXEC = $[ + "target" : $[ + "bash_output" : $[ "exit" : 0, "stdout" : "charmap=\"UTF-8\"\n"] + ] +]; + +TESTSUITE_INIT ([READ, $[], EXEC], nil); + +import "Wagon"; + +// check parsing registration status file + +// one registered product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-1product.xml")), [[READ], [], []], 0); + +// two registered products +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-2products.xml")), [[READ], [], []], 0); + +// one expired product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-expired.xml")), [[READ], [], []], 0); + +// failed registration +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-error.xml")), [[READ], [], []], 0); + + +} Added: branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-1product.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-1product.xml (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-1product.xml Fri Nov 25 19:20:26 2011 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> Added: branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-2products.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-2products.xml (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-2products.xml Fri Nov 25 19:20:26 2011 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> Added: branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-error.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-error.xml (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-error.xml Fri Nov 25 19:20:26 2011 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1279715826"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Linux Enterprise Server 11 SP1 was provided.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Lifecycle Management Server 1.0 was provided.</message> + </productstatus> +</status> Added: branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-expired.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-expired.xml (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/registration-expired.xml Fri Nov 25 19:20:26 2011 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_SUB_EXP"> + <subscription status="EXPIRED" expiration="1280302484" type="EVALUATION"/> + <message>The subscription for SUSE Lifecycle Management Server 1.0 is expired.</message> + </productstatus> +</status> -- 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] r66961 - in /branches/SuSE-Code-11-SP2-Branch/wagon: ./ package/ src/modules/ testsuite/ testsuite/tests/
by lslezak＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: lslezak Date: Fri Nov 25 18:47:22 2011 New Revision: 66961 URL: http://svn.opensuse.org/viewcvs/yast?rev=66961&view=rev Log: - fixed registration status check when there is only one product installed (bnc#732813) - 2.17.27 - added tests Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.err branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.out branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.ycp branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-1product.xml branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-2products.xml branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-error.xml branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-expired.xml Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/Makefile.am Modified: branches/SuSE-Code-11-SP2-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/VERSION Fri Nov 25 18:47:22 2011 @@ -1 +1 @@ -2.17.26 +2.17.27 Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Fri Nov 25 18:47:22 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 25 16:15:24 UTC 2011 - lslezak(a)suse.cz + +- fixed registration status check when there is only one product + installed (bnc#732813) +- 2.17.27 + +------------------------------------------------------------------- Thu Nov 3 15:55:33 UTC 2011 - lslezak(a)suse.cz - display "Registration Code" checkbox in the registration step Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Fri Nov 25 18:47:22 2011 @@ -861,7 +861,9 @@ map status = RegistrationStatus::ReadFile(file); timestamp = tointeger(status["generated"]:"-1"); - list<map> products = status["productstatus"]:[]; + + any read_products = status["productstatus"]:nil; + list<map> products = is(read_products, map) ? [ (map)read_products ] : (list<map>)read_products; // check each product foreach(map product, products, Modified: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/Makefile.am Fri Nov 25 18:47:22 2011 @@ -5,7 +5,7 @@ # AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) $(wildcard tests/*.xml) testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.out (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.out Fri Nov 25 18:47:22 2011 @@ -0,0 +1,21 @@ +Read .target.tmpdir "/tmp" +Read .target.stat "/y2update/control.xml" $["isreg":true] +Read .target.size "/y2update/control.xml" 1 +Read .xml "/y2update/control.xml" $[] +Read .sysconfig.console.CONSOLE_ENCODING "UTF-8" +Execute .target.bash_output "locale -k charmap" $["exit":0, "stdout":"charmap=\"UTF-8\"\n"] +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .target.size "/etc/sysconfig/language" 1 +Read .sysconfig.language.ROOT_USES_LANG "ctype" +Read .sysconfig.language.RC_LANG "en_US.UTF-8" +Read .sysconfig.language.INSTALLED_LANGUAGES "" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Read .target.string ["//etc/SuSE-release", "?"] "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" +Read .target.size "tests/registration-1product.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-2products.xml" 1 +Return $["expired":[], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES", "sle-slms"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-expired.xml" 1 +Return $["expired":["sle-slms"], "failed":[], "no_subscription":[], "provisional":[], "registered":["SUSE_SLES"], "registered_system":true, "rma":[], "timestamp":1280122800] +Read .target.size "tests/registration-error.xml" 1 +Return $["expired":[], "failed":["SUSE_SLES", "sle-slms"], "no_subscription":[], "provisional":[], "registered":[], "registered_system":true, "rma":[], "timestamp":1279715826] Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/Wagon_test.ycp Fri Nov 25 18:47:22 2011 @@ -0,0 +1,57 @@ +/** + * Testsuite for Wagon.ycp module + * + */ + +{ + +include "testsuite.ycp"; + +// huh, we need to mock too much paths because of some module constructor... :-( +map READ = $[ + "target" : $[ + "tmpdir" : "/tmp", + "size" : 1, + "stat" : $["isreg": true], + "string" : "SUSE Linux Enterprise Server 11 (x86_64)\nVERSION = 11\nPATCHLEVEL = 1\n" + ], + "xml" : $[], + "sysconfig" : $[ + "language" : $[ + "RC_LANG" : "en_US.UTF-8", + "ROOT_USES_LANG" : "ctype", + "RC_LANG" : "en_US.UTF-8", + "INSTALLED_LANGUAGES" : "" + ], + "console" : $[ + "CONSOLE_ENCODING" : "UTF-8" + ] + ] +]; + +map EXEC = $[ + "target" : $[ + "bash_output" : $[ "exit" : 0, "stdout" : "charmap=\"UTF-8\"\n"] + ] +]; + +TESTSUITE_INIT ([READ, $[], EXEC], nil); + +import "Wagon"; + +// check parsing registration status file + +// one registered product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-1product.xml")), [[READ], [], []], 0); + +// two registered products +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-2products.xml")), [[READ], [], []], 0); + +// one expired product +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-expired.xml")), [[READ], [], []], 0); + +// failed registration +TEST (``(Wagon::RegistrationStatusFromFile("tests/registration-error.xml")), [[READ], [], []], 0); + + +} Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-1product.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-1product.xml (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-1product.xml Fri Nov 25 18:47:22 2011 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-2products.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-2products.xml (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-2products.xml Fri Nov 25 18:47:22 2011 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="" type="FULL"/> + <message>No errors.</message> + </productstatus> +</status> Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-error.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-error.xml (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-error.xml Fri Nov 25 18:47:22 2011 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1279715826"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Linux Enterprise Server 11 SP1 was provided.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_NO_CODE"> + <message>No registration key for SUSE Lifecycle Management Server 1.0 was provided.</message> + </productstatus> +</status> Added: branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-expired.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-expired.xml (added) +++ branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/registration-expired.xml Fri Nov 25 18:47:22 2011 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<status generated="1280122800"> + <productstatus product="SUSE_SLES" version="11.1" release="DVD" arch="x86_64" result="success" errorcode="OK"> + <subscription status="ACTIVE" expiration="1577905200" type="FULL"/> + <message>No errors.</message> + </productstatus> + <productstatus product="sle-slms" version="1.1" release="cd" arch="x86_64" result="error" errorcode="ERR_SUB_EXP"> + <subscription status="EXPIRED" expiration="1280302484" type="EVALUATION"/> + <message>The subscription for SUSE Lifecycle Management Server 1.0 is expired.</message> + </productstatus> +</status> -- 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] r66960 - /tags/branch-Code-11-SP2-2_17_31/iscsi-client/
by aschnell＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: aschnell Date: Fri Nov 25 17:12:20 2011 New Revision: 66960 URL: http://svn.opensuse.org/viewcvs/yast?rev=66960&view=rev Log: Created tag branch-Code-11-SP2-2_17_31 for iscsi-client Added: tags/branch-Code-11-SP2-2_17_31/iscsi-client/ (props changed) - copied from r66959, branches/SuSE-Code-11-SP2-Branch/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66959 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by aschnell＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: aschnell Date: Fri Nov 25 17:11:32 2011 New Revision: 66959 URL: http://svn.opensuse.org/viewcvs/yast?rev=66959&view=rev Log: - also show output of targets read from firmware in tab with discovered targets (bnc#725833) 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 Fri Nov 25 17:11:32 2011 @@ -1 +1 @@ -2.17.30 +2.17.31 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 Fri Nov 25 17:11:32 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 25 17:09:26 CET 2011 - aschnell(a)suse.de + +- 2.17.31 +- also show output of targets read from firmware in tab with + discovered targets (bnc#725833) + +------------------------------------------------------------------- Thu Nov 3 13:06:10 CET 2011 - fehr(a)suse.de - 2.17.30 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 Fri Nov 25 17:11:32 2011 @@ -69,6 +69,49 @@ } +list< map<string, any> > parse_m_fw(list<string> lines) +{ + // y2milestone("lines:%1", lines); + list< map<string, any> > entries = []; + + map<string, any> entry = $[]; + + foreach(string line, lines, { + + if (String::StartsWith(line, "# BEGIN RECORD")) + { + entry = $[]; + } + else if (String::StartsWith(line, "# END RECORD")) + { + entries = add(entries, entry); + } + else + { + list<string> key_value = splitstring(line, "="); + string key = String::CutBlanks(key_value[0]:""); + string value = String::CutBlanks(key_value[1]:""); + entry[key] = value; + } + }); + + return entries; +} + + +list< map<string, any> > parse_m_iface(list<string> lines) +{ + list< map<string, any> > entries = []; + + foreach(string line, lines, { + list<string> tmp = splitstring(line, ","); + entries = add(entries, $[ "name" : tmp[0]:"", "hwaddress" : tmp[1]:"" ]); + }); + + return entries; +} + + /** * get iBFT (available only on some special hardware) */ @@ -286,6 +329,34 @@ { discovered = ScanDiscovered( splitstring(retcode["stdout"]:"","\n") ); } + + retcode = (map<string, any>) SCR::Execute(.target.bash_output, GetAdmCmd("-m fw")); + if (isempty(retcode["stderr"]:"")) + { + list< map<string, any> > iscsi_adm_m_fw = parse_m_fw(splitstring(retcode["stdout"]:"", "\n")); + + retcode = (map<string, any>) SCR::Execute(.target.bash_output, GetAdmCmd("-m iface")); + if (isempty(retcode["stderr"]:"")) + { + list< map<string, any> > iscsi_adm_m_iface = parse_m_iface(splitstring(retcode["stdout"]:"", "\n")); + + foreach (map<string, any> tmp1, iscsi_adm_m_fw, { + + string interface = "unknown"; + + foreach (map<string, any> iface, iscsi_adm_m_iface, { + if (iface["hwaddress"]:"" == tmp1["iface.hwaddress"]:"" && + String::StartsWith(iface["name"]:"", "eth")) + interface = iface["name"]:""; + }); + + string tmp2 = tmp1["node.conn[0].address"]:"" + ":" + tmp1["node.conn[0].port"]:"" + " " + + tmp1["node.name"]:"" + " " + interface; + discovered = add(discovered, tmp2); + }); + } + } + return discovered; } -- 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] r66958 - in /trunk/autoinstallation/doc: Makefile.am xml/Makefile.am
by fs＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: fs Date: Fri Nov 25 16:45:13 2011 New Revision: 66958 URL: http://svn.opensuse.org/viewcvs/yast?rev=66958&view=rev Log: Basic makefile functionality is there, still needs some work: PHONY targets for html and pdf need to be replaced by implicit targets; install-local needs fixing; check whether make -i package-local creates usable stuff and whether the spec-file template needs to be adjusted Modified: trunk/autoinstallation/doc/Makefile.am trunk/autoinstallation/doc/xml/Makefile.am Modified: trunk/autoinstallation/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Makefile.am… ============================================================================== --- trunk/autoinstallation/doc/Makefile.am (original) +++ trunk/autoinstallation/doc/Makefile.am Fri Nov 25 16:45:13 2011 @@ -4,21 +4,28 @@ # $Id$ # -SUBDIRS = xml autodocs entities bin components examples xsl -htmldir = $(docdir)/html +#SUBDIRS = xml +#htmldir = $(docdir)/html +html_DATA = html +doc_DATA = pdf -pdf: xml/ay_bigfile.xml - daps -e ENV-autoyast pdf-color -html: xml/ay_bigfile.xml - daps -e ENV-autoyast html +html: + $(MAKE) -C xml html -pkgsrc: xml/ay_bigfile.xml - daps -e ENV-autoyast package-src +pdf: + $(MAKE) -C xml pdf -html-debug: xml/ay_bigfile.xml - daps --debug -e ENV-autoyast html +pkgsrc: + $(MAKE) -C xml pkgsrc -xml/ay_bigfile.xml: - cd xml; make ay_bigfile.xml +html-debug: + $(MAKE) -C xml pkgsrc + +bigfile: + $(MAKE) -C xml ay_bigfile.xml + +clean: + $(MAKE) -C xml clean + rm -rf build Modified: trunk/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Makefil… ============================================================================== --- trunk/autoinstallation/doc/xml/Makefile.am (original) +++ trunk/autoinstallation/doc/xml/Makefile.am Fri Nov 25 16:45:13 2011 @@ -22,11 +22,12 @@ STYLESHEET_CSS = default.css -DAPS_BASE=$(shell readlink -f ..) - html_DATA = html doc_DATA = pdf + +DAPS_BASE := $(shell readlink -f ..) + #html_DATA = $(wildcard html/*.html) \ # html/index.html \ # html/yast2docs.css \ @@ -37,16 +38,18 @@ .PHONY: pdf html pkgsrc html-debug entities html: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -html: RESULTDIR=$(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) html-dir-name 2>/dev/null) +html: RESULTDIR := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) html-dir-name 2>/dev/null) html: daps -e ENV-autoyast --basedir=$(DAPS_BASE) html --static rm -rf html && mkdir -p html - mv $(RESULTDIR)/* html + cp -a $(RESULTDIR)/* html pdf: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -pdf: RESULTDIR=$(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) +pdf: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) pdf: daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color + mkdir -p pdf + cp -a $(PDF_FILE) pdf pkgsrc: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml daps -e ENV-autoyast --basedir=$(DAPS_BASE) package-src @@ -101,9 +104,12 @@ xsltproc --output $@ \ /usr/share/susedoc/xslt/misc/db2novdoc.xsl $< +install-data-local: html pdf +install-data-local: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) install-data-local: install -d -m 755 $(DESTDIR)$(htmldir) cp -a $(srcdir)/html/* $(DESTDIR)$(htmldir) + cp -a $(srcdir)/$(shell basename $(PDF_FILE)) $(docdir) # cp -a $(srcdir)/html/images $(DESTDIR)$(htmldir) # cp -a $(srcdir)/html/img $(DESTDIR)$(htmldir) # cp -a $(srcdir)/html/devel $(DESTDIR)$(htmldir) -- 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] r66957 - in /trunk/core: ./ agent-ini/src/ agent-ini/testsuite/tests/ agent-process/testsuite/tests/ package/
by mvidner＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: mvidner Date: Fri Nov 25 14:58:55 2011 New Revision: 66957 URL: http://svn.opensuse.org/viewcvs/yast?rev=66957&view=rev Log: ini-agent: Fixed a test failure "wrong stderr for nonex" (bnc#706705#c16) process-agent: a badly designed test is less likely to fail now svn merge -c65449 -c65457 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP1-Branch/core Modified: trunk/core/ (props changed) trunk/core/VERSION trunk/core/agent-ini/src/IniParser.h trunk/core/agent-ini/testsuite/tests/nonex.err trunk/core/agent-process/testsuite/tests/stderr.ycp trunk/core/agent-process/testsuite/tests/stdout.ycp trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=66957&r1=66956&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri Nov 25 14:58:55 2011 @@ -1 +1 @@ -2.21.7 +2.21.8 Modified: trunk/core/agent-ini/src/IniParser.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/src/IniParser.h?r… ============================================================================== --- trunk/core/agent-ini/src/IniParser.h (original) +++ trunk/core/agent-ini/src/IniParser.h Fri Nov 25 14:58:55 2011 @@ -392,6 +392,7 @@ // apparently the uninitialized members are filled in // by the grammar definition IniParser () : + timestamp (0), linecomments (), comments (), sections (), params (), rewrites (), started (false), multiple_files (false), Modified: trunk/core/agent-ini/testsuite/tests/nonex.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/tests/n… ============================================================================== --- trunk/core/agent-ini/testsuite/tests/nonex.err (original) +++ trunk/core/agent-ini/testsuite/tests/nonex.err Fri Nov 25 14:58:55 2011 @@ -1,7 +1,5 @@ [agent-ini] IniParser.cc(parse):XXX Can not open tests/nonex.in.test. [agent-ini] IniParser.cc(getTimeStamp):XXX Unable to stat 'tests/nonex.in.test': No such file or directory -[agent-ini] IniParser.cc(UpdateIfModif):XXX Data file 'tests/nonex.in.test' was changed externaly! -[agent-ini] IniParser.cc(parse):XXX Can not open tests/nonex.in.test. [YCP] tests/nonex.ycp:XXX KEY: nil [agent-ini] IniParser.cc(UpdateIfModif):XXX Data file 'tests/nonex.in.test' was changed externaly! [YCP] tests/nonex.ycp:XXX KEY: value Modified: trunk/core/agent-process/testsuite/tests/stderr.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/testsuite/tes… ============================================================================== --- trunk/core/agent-process/testsuite/tests/stderr.ycp (original) +++ trunk/core/agent-process/testsuite/tests/stderr.ycp Fri Nov 25 14:58:55 2011 @@ -8,12 +8,12 @@ string out1 = (string)SCR::Read(.read_stderr, id); SCR::Write(., id, "foo\n"); - sleep(50); + sleep(250); // read "foo\n" string out2 = (string)SCR::Read(.read_stderr, id); SCR::Write(., id, "foo2\nfoo2\n"); - sleep(50); + sleep(250); // read "foo2\nfoo2\n" string out3 = (string)SCR::Read(.read_stderr, id); @@ -35,12 +35,12 @@ string out1 = (string)SCR::Read(.read_line_stderr, id); SCR::Write(., id, "foo\n"); - sleep(50); + sleep(250); // read "foo\n" string out2 = (string)SCR::Read(.read_line_stderr, id); SCR::Write(., id, "foo2\nfoo2\n"); - sleep(50); + sleep(250); // read "foo2\n" string out3 = (string)SCR::Read(.read_line_stderr, id); Modified: trunk/core/agent-process/testsuite/tests/stdout.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/testsuite/tes… ============================================================================== --- trunk/core/agent-process/testsuite/tests/stdout.ycp (original) +++ trunk/core/agent-process/testsuite/tests/stdout.ycp Fri Nov 25 14:58:55 2011 @@ -8,12 +8,12 @@ string out1 = (string)SCR::Read(.read, id); SCR::Write(., id, "foo\n"); - sleep(50); + sleep(250); // read "foo\n" string out2 = (string)SCR::Read(.read, id); SCR::Write(., id, "foo2\nfoo2\n"); - sleep(50); + sleep(250); // read "foo2\nfoo2\n" string out3 = (string)SCR::Read(.read, id); @@ -34,12 +34,12 @@ string out1 = (string)SCR::Read(.read_line, id); SCR::Write(., id, "foo\n"); - sleep(50); + sleep(250); // read "foo\n" string out2 = (string)SCR::Read(.read_line, id); SCR::Write(., id, "foo2\nfoo2\n"); - sleep(50); + sleep(250); // read "foo2\n" string out3 = (string)SCR::Read(.read_line, id); Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Nov 25 14:58:55 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 25 14:11:01 CET 2011 - mvidner(a)suse.cz + +- ini-agent: Fixed a test failure "wrong stderr for nonex" + (bnc#706705#c16) +- process-agent: a badly designed test is less likely to fail now +- 2.21.8 + +------------------------------------------------------------------- Fri Nov 25 12:18:18 UTC 2011 - coolo(a)suse.com - add libtool as buildrequire to avoid implicit dependency -- 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] r66956 - /tags/stable-2_22_1/country/
by jsuchome＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: jsuchome Date: Fri Nov 25 14:55:11 2011 New Revision: 66956 URL: http://svn.opensuse.org/viewcvs/yast?rev=66956&view=rev Log: Created tag stable-2_22_1 for country Added: tags/stable-2_22_1/country/ - copied from r66955, 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] r66955 - in /trunk/country: VERSION package/yast2-country.changes timezone/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: jsuchome Date: Fri Nov 25 14:54:20 2011 New Revision: 66955 URL: http://svn.opensuse.org/viewcvs/yast?rev=66955&view=rev Log: (patch from visnov) - correctly set the window title during installation (bnc#730650) - 2.22.1 Modified: trunk/country/VERSION 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=66955&r1=669… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Fri Nov 25 14:54:20 2011 @@ -1 +1 @@ -2.22.0 +2.22.1 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 Fri Nov 25 14:54:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 25 14:52:31 CET 2011 - jsuchome(a)suse.cz + +- correctly set the window title during installation (bnc#730650) +- 2.22.1 + +------------------------------------------------------------------- Mon Nov 21 16:02:30 CET 2011 - jsuchome(a)suse.cz - do not set keyboard layout on module start, when not in 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 Fri Nov 25 14:54:20 2011 @@ -259,7 +259,9 @@ Wizard::OpenAcceptDialog (); // TODO replace help text after ntp_installed, is. Wizard::SetContents (_("Change Date and Time"), cont, htext, true, true); - Wizard::SetDesktopTitleAndIcon("timezone"); + + if( Mode::normal() ) + Wizard::SetDesktopTitleAndIcon("timezone"); show_current_time (); @@ -726,11 +728,14 @@ Wizard::SetContents (_("Clock and Time Zone"), contents, help_text, args["enable_back"]:true, args["enable_next"]:true); - Wizard::SetDesktopTitleAndIcon ("timezone"); if ( Stage::initial () || Stage::firstboot ()) { Wizard::SetTitleIcon ("yast-timezone"); } + else + { + Wizard::SetDesktopTitleAndIcon ("timezone"); + } symbol hwclock_s = (hwclock=="-u") ? `hwclock_utc : `hwclock_localtime; symbol hwclock_s_old = hwclock_s; -- 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] r66954 - /trunk/autoinstallation/doc/bin/ima2imaobj.pl
by fs＠svn2.opensuse.org 25 Nov '11

25 Nov '11

Author: fs Date: Fri Nov 25 14:27:44 2011 New Revision: 66954 URL: http://svn.opensuse.org/viewcvs/yast?rev=66954&view=rev Log: Generated Imageobjects have now role attributes (fo,html); fo images are scaled down to 75% Modified: trunk/autoinstallation/doc/bin/ima2imaobj.pl Modified: trunk/autoinstallation/doc/bin/ima2imaobj.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/bin/ima2ima… ============================================================================== Binary files - no diff available. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0