[yast-commit] r64694 - in /branches/SuSE-Code-11-SP2-Branch/add-on: package/yast2-add-on.changes src/add-on_auto.ycp

Author: ug Date: Fri Jul 1 11:06:03 2011 New Revision: 64694 URL: http://svn.opensuse.org/viewcvs/yast?rev=64694&view=rev Log: fixed relurl://.... for add-on config in autoyast XML (bnc#702863) Modified: branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp Modified: branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes?rev=64694&r1=64693&r2=64694&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes Fri Jul 1 11:06:03 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 1 11:05:21 CEST 2011 - ug@suse.de + +- fixed relurl://.... for add-on config in autoyast XML + (bnc#702863) + +------------------------------------------------------------------- Mon Jun 27 15:14:21 UTC 2011 - lslezak@suse.cz - don't start package manager when license agreement is aborted Modified: branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp?rev=64694&r1=64693&r2=64694&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on_auto.ycp Fri Jul 1 11:06:03 2011 @@ -161,6 +161,13 @@ AddOnProduct::add_on_products = maplist (map prod, AddOnProduct::add_on_products, { string media = prod["media_url"]:""; string pth = prod["product_dir"]:"/"; + + if( issubstring( media, "relurl://" ) ) { + string base = AddOnProduct::GetBaseProductURL(); + media = AddOnProduct::GetAbsoluteURL( base, media ); + y2milestone("relurl changed to %1", base, media); + } + sources[media] = sources[media]:$[]; // set addon specific sig-handling -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org