[yast-commit] r62521 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_addon_update_sources.ycp
Author: lslezak Date: Thu Sep 30 19:46:15 2010 New Revision: 62521 URL: http://svn.opensuse.org/viewcvs/yast?rev=62521&view=rev Log: - don't use spaces in repo alias (bnc#596950) - 2.20.0 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_addon_update_sources.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=62521&r1=62520&r2=62521&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Sep 30 19:46:15 2010 @@ -1 +1 @@ -2.19.20 +2.20.0 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=62521&r1=62520&r2=62521&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Sep 30 19:46:15 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 30 17:33:48 UTC 2010 - lslezak@suse.cz + +- don't use spaces in repo alias (bnc#596950) +- 2.20.0 + +------------------------------------------------------------------- Wed Jun 2 13:52:02 CEST 2010 - jsrain@suse.cz - removed link to repairing the system Modified: trunk/installation/src/clients/inst_addon_update_sources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_addon_update_sources.ycp?rev=62521&r1=62520&r2=62521&view=diff ============================================================================== --- trunk/installation/src/clients/inst_addon_update_sources.ycp (original) +++ trunk/installation/src/clients/inst_addon_update_sources.ycp Thu Sep 30 19:46:15 2010 @@ -18,6 +18,7 @@ import "SourceManager"; import "Report"; import "Installation"; +import "String"; include "packager/inst_source_dialogs.ycp"; @@ -91,14 +92,17 @@ while (again) { // BNC #557723: Repositories migh be created without access to network // Libzypp must not probe the repo + + // don't use spaces in alias (hard to use with zypper) + string alias = String::Replace((size(name) > 0 ? name : url), " ", "-"); + map <string,any> repo_prop = $[ "enabled" : true, "autorefresh" : true, "name" : (size(name) > 0 ? name : url), - "alias" : (size(name) > 0 ? name : url), + "alias" : alias, "base_urls" : [url], "prod_dir" : "/", - ]; integer srcid = Pkg::RepositoryAdd (repo_prop); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
lslezak@svn2.opensuse.org