Author: jsrain Date: Fri Jun 19 13:09:18 2009 New Revision: 57655 URL: http://svn.opensuse.org/viewcvs/yast?rev=57655&view=rev Log: removed cyclic dependency between YCP modules preventing from correct build Modified: trunk/yast2/library/types/src/Hostname.ycp trunk/yast2/library/types/testsuite/tests/Address.out trunk/yast2/library/types/testsuite/tests/Hostname.out trunk/yast2/library/types/testsuite/tests/IPvalidation.out trunk/yast2/library/types/testsuite/tests/URL.out trunk/yast2/library/types/testsuite/tests/enumtype.out trunk/yast2/library/types/testsuite/tests/regextype.out trunk/yast2/library/types/testsuite/tests/undefinedtype.out trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/types/src/Hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/Hostname.ycp?rev=57655&r1=57654&r2=57655&view=diff ============================================================================== --- trunk/yast2/library/types/src/Hostname.ycp (original) +++ trunk/yast2/library/types/src/Hostname.ycp Fri Jun 19 13:09:18 2009 @@ -15,7 +15,6 @@ import "IP"; import "String"; -import "FileUtils"; /** * i18n characters in domain names are still not allowed @@ -145,7 +144,7 @@ map hostname_data = (map) SCR::Execute(.target.bash_output, "hostname --fqdn"); if (hostname_data == nil || hostname_data["exit"]:-1 != 0 ) { - fqhostname = (FileUtils::Exists ("/etc/HOSTNAME") ? (string) SCR::Read(.target.string, "/etc/HOSTNAME"):""); + fqhostname = ($[] != (map) SCR::Read(.target.stat, "/etc/HOSTNAME") ? (string) SCR::Read(.target.string, "/etc/HOSTNAME"):""); if ( fqhostname == "" || fqhostname == nil ) { Modified: trunk/yast2/library/types/testsuite/tests/Address.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/tests/Address.out?rev=57655&r1=57654&r2=57655&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/Address.out (original) +++ trunk/yast2/library/types/testsuite/tests/Address.out Fri Jun 19 13:09:18 2009 @@ -1,4 +1,3 @@ -Read .target.tmpdir "/tmp" Dump Address::Check Return false Return false Modified: trunk/yast2/library/types/testsuite/tests/Hostname.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/tests/Hostname.out?rev=57655&r1=57654&r2=57655&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/Hostname.out (original) +++ trunk/yast2/library/types/testsuite/tests/Hostname.out Fri Jun 19 13:09:18 2009 @@ -1,4 +1,3 @@ -Read .target.tmpdir "/tmp" Dump Hostname::Check Return false Return false Modified: trunk/yast2/library/types/testsuite/tests/IPvalidation.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/tests/IPvalidation.out?rev=57655&r1=57654&r2=57655&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/IPvalidation.out (original) +++ trunk/yast2/library/types/testsuite/tests/IPvalidation.out Fri Jun 19 13:09:18 2009 @@ -1,4 +1,3 @@ -Read .target.tmpdir "/tmp" Return true Return false Return true Modified: trunk/yast2/library/types/testsuite/tests/URL.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/tests/URL.out?rev=57655&r1=57654&r2=57655&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/URL.out (original) +++ trunk/yast2/library/types/testsuite/tests/URL.out Fri Jun 19 13:09:18 2009 @@ -1,4 +1,3 @@ -Read .target.tmpdir "/tmp" Return $["fragment":"part", "host":"www.suse.cz", "pass":"pass", "path":"/path/index.html", "port":"80", "query":"question", "scheme":"http", "user":"name"] Return Return Modified: trunk/yast2/library/types/testsuite/tests/enumtype.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/tests/enumtype.out?rev=57655&r1=57654&r2=57655&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/enumtype.out (original) +++ trunk/yast2/library/types/testsuite/tests/enumtype.out Fri Jun 19 13:09:18 2009 @@ -1,4 +1,3 @@ -Read .target.tmpdir "/tmp" Return true Return false Return false Modified: trunk/yast2/library/types/testsuite/tests/regextype.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/tests/regextype.out?rev=57655&r1=57654&r2=57655&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/regextype.out (original) +++ trunk/yast2/library/types/testsuite/tests/regextype.out Fri Jun 19 13:09:18 2009 @@ -1,3 +1,2 @@ -Read .target.tmpdir "/tmp" Return true Return false Modified: trunk/yast2/library/types/testsuite/tests/undefinedtype.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/tests/undefinedtype.out?rev=57655&r1=57654&r2=57655&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/undefinedtype.out (original) +++ trunk/yast2/library/types/testsuite/tests/undefinedtype.out Fri Jun 19 13:09:18 2009 @@ -1,3 +1,2 @@ -Read .target.tmpdir "/tmp" Log Request to validate unknown type blem Return false Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=57655&r1=57654&r2=57655&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jun 19 13:09:18 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 19 13:01:19 CEST 2009 - jsrain@suse.cz + +- removed cyclic dependency between YCP modules preventing from + correct build + +------------------------------------------------------------------- Tue Jun 16 16:44:49 CEST 2009 - mvidner@suse.cz - Using autodocs-ycp.ami, which contains a fix for automake 1.11. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org