Mailinglist Archive: yast-commit (650 mails)

[locilka@xxxxxxxxxxxxxxxx]

Author: locilka
Date: Tue Feb 17 17:07:00 2009
New Revision: 55565

URL: http://svn.opensuse.org/viewcvs/yast?rev=55565&view=rev
Log:
- Writing additional-control-files index file after removing and
  recreating the directory where it is stored (bnc #475516).
- 2.17.52


Modified:
    branches/SuSE-Code-11-Branch/installation/VERSION
    branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes
    branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp

Modified: branches/SuSE-Code-11-Branch/installation/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installation/VERSION?rev=55565&r1=55564&r2=55565&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/installation/VERSION (original)
+++ branches/SuSE-Code-11-Branch/installation/VERSION Tue Feb 17 17:07:00 2009
@@ -1 +1 @@
-2.17.51
+2.17.52

Modified: 
branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes?rev=55565&r1=55564&r2=55565&view=diff
==============================================================================
--- 
branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes 
(original)
+++ 
branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes 
Tue Feb 17 17:07:00 2009
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Feb 17 16:56:09 CET 2009 - locilka@xxxxxxx
+
+- Writing additional-control-files index file after removing and
+  recreating the directory where it is stored (bnc #475516).
+- 2.17.52
+
+-------------------------------------------------------------------
 Mon Feb  9 13:21:50 CET 2009 - locilka@xxxxxxx
 
 - Enabling online update in (SLED) Automatic Configuration

Modified: 
branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp?rev=55565&r1=55564&r2=55565&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp 
(original)
+++ branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp 
Tue Feb 17 17:07:00 2009
@@ -61,15 +61,18 @@
        workflows_list = add (workflows_list, one_filename);
     });
 
-    // They need to follow the exact order
-    SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + 
"/control_files/order.ycp",
-       workflows_list);
-
     // Remove the directory with all additional control files (if exists)
     // and create it again (empty). BNC #471454
     SCR::Execute (.target.bash, sformat ("rm -rf '%1'; /bin/mkdir -p '%1'",
        String::Quote (Installation::destdir + Directory::etcdir + 
"/control_files")));
 
+    // BNC #475516: Writing the control-files-order index 'after' removing the 
directory
+    // Control files need to follow the exact order, only those liseted here 
are used
+    SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + 
"/control_files/order.ycp",
+       workflows_list);
+    SCR::Execute (.target.bash, "/bin/chmod 0644 " +
+       "'" + String::Quote (Installation::destdir) + Directory::etcdir + 
"/control_files/order.ycp'");
+
     // Now copy all the additional control files to the just installed system
     foreach (string file, WorkflowManager::GetAllUsedControlFiles(), {
        SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " +
@@ -77,9 +80,6 @@
        SCR::Execute (.target.bash, "/bin/chmod 0644 " +
            "'" + String::Quote (Installation::destdir) + Directory::etcdir + 
"/control_files/" + String::Quote (file) + "'");
     });
-
-    SCR::Execute (.target.bash, "/bin/chmod 0644 " +
-       "'" + String::Quote (Installation::destdir) + Directory::etcdir + 
"/control_files/order.ycp'");
 }
 
 // see bugzilla #328126

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx