Author: locilka Date: Mon Nov 30 14:44:48 2009 New Revision: 59858 URL: http://svn.opensuse.org/viewcvs/yast?rev=59858&view=rev Log: - Repositories added by inst_addon_update_sources use Pkg::RepositoryAdd that does not need access to network (bnc #557723) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_addon_update_sources.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=59858&r1=59857&r2=59858&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Nov 30 14:44:48 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 30 14:38:26 CET 2009 - locilka@suse.cz + +- Repositories added by inst_addon_update_sources use + Pkg::RepositoryAdd that does not need access to network + (bnc #557723) + +------------------------------------------------------------------- Tue Nov 24 16:13:31 CET 2009 - kmachalkova@suse.cz Cumulative patch with SLE11 SP1 features: 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=59858&r1=59857&r2=59858&view=diff ============================================================================== --- trunk/installation/src/clients/inst_addon_update_sources.ycp (original) +++ trunk/installation/src/clients/inst_addon_update_sources.ycp Mon Nov 30 14:44:48 2009 @@ -89,8 +89,20 @@ boolean again = true; while (again) { - integer srcid = Pkg::SourceCreate (url, "/"); - y2milestone ("got %1 from creating %2", srcid, url); + // BNC #557723: Repositories migh be created without access to network + // Libzypp must not probe the repo + map <string,any> repo_prop = $[ + "enabled" : true, + "autorefresh" : true, + "name" : (size(name) > 0 ? name : url), + "alias" : (size(name) > 0 ? name : url), + "base_urls" : [url], + "prod_dir" : "/", + + ]; + + integer srcid = Pkg::RepositoryAdd (repo_prop); + y2milestone ("got %1 from creating %2/%3", srcid, url, name); // wrong srcid, must have failed if (srcid == -1) { @@ -112,9 +124,6 @@ // everything is ok } else { - // bnc #542792 - // Repository name must be set - Pkg::SourceEditSet([ $["SrcId" : srcid, "name" : name] ]); added_ids = add (added_ids, srcid); again = false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org