Author: mzugec Date: Tue Jun 12 18:06:47 2007 New Revision: 38417 URL: http://svn.opensuse.org/viewcvs/yast?rev=38417&view=rev Log: fixed CheckDomain function - allow "." character at the end of domain name (suse.cz.) Modified: trunk/yast2/VERSION trunk/yast2/library/types/src/Hostname.ycp trunk/yast2/library/types/testsuite/tests/Hostname.out trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=38417&r1=38416&r2=38417&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Jun 12 18:06:47 2007 @@ -1 +1 @@ -2.15.35 +2.15.36 Modified: trunk/yast2/library/types/src/Hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/Hostname.ycp?rev=38417&r1=38416&r2=38417&view=diff ============================================================================== --- trunk/yast2/library/types/src/Hostname.ycp (original) +++ trunk/yast2/library/types/src/Hostname.ycp Tue Jun 12 18:06:47 2007 @@ -73,6 +73,10 @@ */ global define boolean CheckDomain(string domain) ``{ if (domain == nil || domain == "") return false; + // if "domain" contains "." character as last character remove it before validation (but it's valid) + if (size(domain)>1){ + if (substring(domain, size(domain)-1, 1)==".") domain = substring(domain, 0, size(domain)-1); + } list <string> l = splitstring(domain, "."); if (contains (maplist(string h, l, ``(Check(h))), false)) return false; return !regexpmatch (domain, "\\.[[:digit:]][^.]*$"); 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=38417&r1=38416&r2=38417&view=diff ============================================================================== --- trunk/yast2/library/types/testsuite/tests/Hostname.out (original) +++ trunk/yast2/library/types/testsuite/tests/Hostname.out Tue Jun 12 18:06:47 2007 @@ -21,7 +21,7 @@ Dump Hostname::CheckDomain Return false Return false -Return false +Return true Return false Return false Return false Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=38417&r1=38416&r2=38417&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Jun 12 18:06:47 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 12 18:05:51 CEST 2007 - mzugec@suse.cz + +- fixed CheckDomain function - allow "." character at the end +of domain name (suse.cz.) +- 2.15.36 + +------------------------------------------------------------------- Thu Jun 7 10:14:06 CEST 2007 - lslezak@suse.cz - speed up PackageSystem::InstallKernel() - call rpm directly -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org