Mailinglist Archive: yast-commit (815 mails)

< Previous Next >
[yast-commit] r39922 - in /trunk/packager: package/yast2-packager.changes src/modules/AddOnProduct.ycp
  • From: locilka@xxxxxxxxxxxxxxxx
  • Date: Fri, 03 Aug 2007 09:56:47 -0000
  • Message-id: <20070803095647.6B991B595C@xxxxxxxxxxxxxxxx>
Author: locilka
Date: Fri Aug  3 11:56:47 2007
New Revision: 39922

URL: http://svn.opensuse.org/viewcvs/yast?rev=39922&view=rev
Log:
- Download and use y2update before merging installation.xml when
  use Add-On product in installation (#295160).


Modified:
    trunk/packager/package/yast2-packager.changes
    trunk/packager/src/modules/AddOnProduct.ycp

Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=39922&r1=39921&r2=39922&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Fri Aug  3 11:56:47 2007
@@ -13,6 +13,8 @@
 - Using new pkg-bindings functionality to provide optional
   directory with licenses (#302018).
 - New text for License dialog (FATE #302018 comment #36).
+- Download and use y2update before merging installation.xml when
+  use Add-On product in installation (#295160).
 
 -------------------------------------------------------------------
 Thu Aug  2 11:08:37 CEST 2007 - lslezak@xxxxxxx

Modified: trunk/packager/src/modules/AddOnProduct.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduct.ycp?rev=39922&r1=39921&r2=39922&view=diff
==============================================================================
--- trunk/packager/src/modules/AddOnProduct.ycp (original)
+++ trunk/packager/src/modules/AddOnProduct.ycp Fri Aug  3 11:56:47 2007
@@ -509,17 +509,18 @@
 global boolean Integrate (integer srcid) {
     y2milestone ("Integrating repository %1", srcid);
 
-    // Adds workflow to the Workflow Store if any workflow exists
-    WorkflowManager::AddWorkflow (`addon, 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);
     }
 
+    // Adds workflow to the Workflow Store if any workflow exists
+    WorkflowManager::AddWorkflow (`addon, srcid, "");
+
     return true;
 }
 

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

< Previous Next >
This Thread
  • No further messages