Author: locilka Date: Wed Feb 4 12:34:24 2009 New Revision: 55228 URL: http://svn.opensuse.org/viewcvs/yast?rev=55228&view=rev Log: - Removing old additional control files during update. Writing new ones according to the current list of add-ons (bnc #471929). - 2.13.212 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/copy_files_finish.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/installation/VERSION?rev=55228&r1=55227&r2=55228&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/VERSION Wed Feb 4 12:34:24 2009 @@ -1 +1 @@ -2.13.211 +2.13.212 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes?rev=55228&r1=55227&r2=55228&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes Wed Feb 4 12:34:24 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 4 12:30:40 CET 2009 - locilka@suse.cz + +- Removing old additional control files during update. Writing new + ones according to the current list of add-ons (bnc #471929). +- 2.13.212 + +------------------------------------------------------------------- Wed Jun 11 15:59:06 CEST 2008 - locilka@suse.cz - Lslezak's patch for AddOnProducts to open up pattern selector Modified: branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/copy_files_finish.ycp?rev=55228&r1=55227&r2=55228&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/copy_files_finish.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/copy_files_finish.ycp Wed Feb 4 12:34:24 2009 @@ -79,21 +79,33 @@ "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'"); SCR::Execute (.target.bash, "/bin/chmod 0644 " + "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'"); + // Copy also control files of add-on products string cf_dir = (string)SCR::Read (.target.tmpdir) + "/control_files"; + string system_cf_dir = Installation::destdir + Directory::etcdir + "/control_files"; + + // BNC #471929 + // Removing previously used control files (and order.ycp) + y2milestone ( + "Removing %1 -> %2", + system_cf_dir, + SCR::Execute (.target.bash, sformat ("rm -rf '%1'", String::Quote (system_cf_dir))) + ); + if (size (AddOnProduct::control_files_to_add) > 0) { - SCR::Execute (.target.bash, "/bin/mkdir '" + - String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + SCR::Execute (.target.bash, "/bin/mkdir -p '" + String::Quote (system_cf_dir) + "'"); + foreach (string file, AddOnProduct::control_files_to_add, { SCR::Execute (.target.bash, "/bin/cp " + cf_dir + "/" + file + " " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + "'" + String::Quote (system_cf_dir) + "'"); SCR::Execute (.target.bash, "/bin/chmod 0644 " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/" + file + "'"); + "'" + String::Quote (system_cf_dir) + file + "'"); }); - SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", AddOnProduct::control_files_to_add); - SCR::Execute (.target.bash, "/bin/chmod 0644 " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/order.ycp'"); + + SCR::Write (.target.ycp, system_cf_dir + "/order.ycp", AddOnProduct::control_files_to_add); + + SCR::Execute (.target.bash, "/bin/chmod 0644 " + "'" + String::Quote (system_cf_dir) + "/order.ycp'"); } // Remove old eula.txt -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org