[yast-commit] r47210 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_extrasources.ycp

Author: locilka Date: Wed Apr 30 12:10:18 2008 New Revision: 47210 URL: http://svn.opensuse.org/viewcvs/yast?rev=47210&view=rev Log: - Adding name and alias tags to extrasources (irc #yast/today). - 2.16.43 Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_extrasources.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=47210&r1=47209&r2=47210&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Apr 30 12:10:18 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 30 12:07:45 CEST 2008 - locilka@suse.cz + +- Adding name and alias tags to extrasources (irc #yast/today). +- 2.16.43 + +------------------------------------------------------------------- Wed Apr 30 10:24:19 CEST 2008 - locilka@suse.cz - Making automatic installation more robust (bnc #384972). Modified: trunk/installation/src/clients/inst_extrasources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_extrasources.ycp?rev=47210&r1=47209&r2=47210&view=diff ============================================================================== --- trunk/installation/src/clients/inst_extrasources.ycp (original) +++ trunk/installation/src/clients/inst_extrasources.ycp Wed Apr 30 12:10:18 2008 @@ -64,14 +64,22 @@ list <integer> ret = []; foreach (map new_url, url_list, { + if (new_url["baseurl"]:"" == nil || new_url["baseurl"]:"" == "") { + y2error ("Cannot use repository: %1, no 'baseurl' defined", new_url); + return; + } + map repo_prop = $[]; // extra repos are disabled by default repo_prop["enabled"] = new_url["enabled"]:false; repo_prop["autorefresh"] = new_url["autorefresh"]:true; - repo_prop["name"] = new_url["baseurl"]:""; - repo_prop["alias"] = new_url["baseurl"]:""; + // repository name (try) name, alias, (fallback) baseurl + repo_prop["name"] = new_url["name"]:new_url["alias"]:new_url["baseurl"]:""; + + // repository alias (trye) + repo_prop["alias"] = new_url["alias"]:new_url["baseurl"]:""; repo_prop["base_urls"] = [new_url["baseurl"]:""]; @@ -80,7 +88,7 @@ } if (haskey (new_url, "priority")) { - repo_prop["priority"] = new_url["priority"]:99; + repo_prop["priority"] = tointeger (new_url["priority"]:99); } integer new_repo_id = Pkg::RepositoryAdd (repo_prop); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org