Author: lslezak Date: Mon Apr 12 14:29:53 2010 New Revision: 61668 URL: http://svn.opensuse.org/viewcvs/yast?rev=61668&view=rev Log: - added a nil check in InstURL.ycp so the testsuite passes during build - 2.17.74 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/InstURL.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/VERSION?rev=61668&r1=61667&r2=61668&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Mon Apr 12 14:29:53 2010 @@ -1 +1 @@ -2.17.73 +2.17.74 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes?rev=61668&r1=61667&r2=61668&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Mon Apr 12 14:29:53 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 12 12:26:42 UTC 2010 - lslezak@suse.cz + +- added a nil check in InstURL.ycp so the testsuite passes + during build +- 2.17.74 + +------------------------------------------------------------------- Tue Apr 6 17:44:25 CEST 2010 - locilka@suse.cz - Searching for LiveCD license in /usr/share/doc/licenses and / Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/InstURL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/src/modules/InstURL.ycp?rev=61668&r1=61667&r2=61668&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/InstURL.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/InstURL.ycp Mon Apr 12 14:29:53 2010 @@ -59,6 +59,12 @@ // add the Linuxrc medium to the beginning string repo_url = Linuxrc::InstallInf("RepoURL"); + + if (repo_url == nil) + { + repo_url = ""; + } + if (regexpmatch(tolower(repo_url), "^cd:") || regexpmatch(tolower(repo_url), "^dvd:")) { y2milestone("Found CD/DVD device in Linuxrc RepoURL: %1", repo_url); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org