Author: locilka Date: Thu Oct 11 09:30:52 2007 New Revision: 41356 URL: http://svn.opensuse.org/viewcvs/yast?rev=41356&view=rev Log: - Unpacking y2update.tgz before merging installation.xml when using a new Add-On. - 2.13.197 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP2-Branch/installation/src/modules/AddOnProduct.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/installation/VERSION?rev=41356&r1=41355&r2=41356&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/VERSION Thu Oct 11 09:30:52 2007 @@ -1 +1 @@ -2.13.196 +2.13.197 Modified: branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes?rev=41356&r1=41355&r2=41356&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/package/yast2-installation.changes Thu Oct 11 09:30:52 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 11 09:26:48 CEST 2007 - locilka@suse.cz + +- Unpacking y2update.tgz before merging installation.xml when using + a new Add-On. +- 2.13.197 + +------------------------------------------------------------------- Fri Jul 20 13:53:21 CEST 2007 - locilka@suse.cz - Added support for relative URLs in the add_on_products file by Modified: branches/SuSE-SLE-10-SP2-Branch/installation/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/installation/src/modules/AddOnProduct.ycp?rev=41356&r1=41355&r2=41356&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/installation/src/modules/AddOnProduct.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/installation/src/modules/AddOnProduct.ycp Thu Oct 11 09:30:52 2007 @@ -1153,6 +1153,17 @@ global boolean Integrate (integer srcid) { y2milestone ("Integrating source %1", srcid); + // bugzilla #297752 + // Update inst-sys before merging the control file + + // Updating inst-sys + string y2update = Pkg::SourceProvideOptionalFile (srcid, 1, "/y2update.tgz"); + if (y2update == nil) { + y2milestone ("No YaST update found on the media"); + } else { + UpdateInstSys (y2update); + } + // Updating workflow or proposals // Trying to use a cached file, bugzilla #221377 @@ -1200,14 +1211,6 @@ control_files_to_add = add (control_files_to_add, sformat ("%1.xml", srcid)); } - // Updating inst-sys - string y2update = Pkg::SourceProvideOptionalFile (srcid, 1, "/y2update.tgz"); - if (y2update == nil) { - y2milestone ("No YaST update found on the media"); - } else { - UpdateInstSys (y2update); - } - return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org