Author: locilka Date: Thu Nov 19 17:10:17 2009 New Revision: 59638 URL: http://svn.opensuse.org/viewcvs/yast?rev=59638&view=rev Log: - REGISTERPRODUCT from content file moved to control file to globals->require_registration (FATE #305578) - 2.17.62 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/VERSION?rev=59638&r1=59637&r2=59638&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Thu Nov 19 17:10:17 2009 @@ -1 +1 @@ -2.17.61 +2.17.62 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes?rev=59638&r1=59637&r2=59638&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Thu Nov 19 17:10:17 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 19 16:51:55 CET 2009 - locilka@suse.cz + +- REGISTERPRODUCT from content file moved to control file to + globals->require_registration (FATE #305578) +- 2.17.62 + +------------------------------------------------------------------- Tue Apr 21 15:34:48 CEST 2009 - lslezak@suse.cz - Append additional RPM output to the installation log only if it Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp?rev=59638&r1=59637&r2=59638&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/AddOnProduct.ycp Thu Nov 19 17:10:17 2009 @@ -671,6 +671,17 @@ * @param integer source id */ global void PrepareForRegistration (integer src_id) { + string control_file = WorkflowManager::GetCachedWorkflowFilename (`addon, src_id, ""); + + if (WorkflowManager::IncorporateControlFileOptions (control_file) == true) { + // FATE #305578: Add-On Product Requiring Registration + if (WorkflowManager::WorkflowRequiresRegistration (src_id)) { + y2milestone ("REGISTERPRODUCT (require_registration) defined in control file"); + addons_requesting_registration = add (addons_requesting_registration, src_id); + return; + } + } + string tmpdir = (string) SCR::Read (.target.tmpdir) + "/add-on-content-files/"; // create directory if doesn't exist @@ -729,7 +740,9 @@ * @param integer source id */ global void RegisterAddOnProduct (integer src_id) { - if (contains (addons_requesting_registration, src_id)) { + // FATE #305578: Add-On Product Requiring Registration + // or check the content file + if (WorkflowManager::WorkflowRequiresRegistration (src_id) || contains (addons_requesting_registration, src_id)) { y2milestone ("Repository ID %1 requests registration", src_id); WFM::CallFunction ("inst_suse_register", []); } else { @@ -777,8 +790,11 @@ symbol ret = nil; - string control = GetCachedFileFromSource (src_id, 1, "/installation.xml", "digested", true /* optional */); + string control = WorkflowManager::GetCachedWorkflowFilename (`addon, src_id, ""); if (control != nil) { + // FATE #305578: Add-On Product Requiring Registration + WorkflowManager::AddWorkflow(`addon, src_id, ""); + y2milestone ("Add-On has own control file"); ret = DoInstall_WithControlFile (control); } Modified: branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in?rev=59638&r1=59637&r2=59638&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Thu Nov 19 17:10:17 2009 @@ -7,8 +7,8 @@ # HTTP.ycp BuildRequires: yast2-transfer -# URL::HidePassword() -BuildRequires: yast2 >= 2.17.47 +# New WorkflowManager +BuildRequires: yast2 >= 2.17.76 # "keeppackages" repo property BuildRequires: yast2-pkg-bindings >= 2.17.27 @@ -19,8 +19,8 @@ # "keeppackages" repo property Requires: yast2-pkg-bindings >= 2.17.27 -# URL::HidePassword() -Requires: yast2 >= 2.17.47 +# New WorkflowManager +Requires: yast2 >= 2.17.76 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org