Author: jsuchome Date: Fri Jun 17 17:01:34 2011 New Revision: 64461 URL: http://svn.opensuse.org/viewcvs/yast?rev=64461&view=rev Log: - check the product profile of new add-on product (fate##310730) - 2.17.23 Modified: branches/SuSE-Code-11-SP2-Branch/add-on/VERSION branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp branches/SuSE-Code-11-SP2-Branch/add-on/yast2-add-on.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/VERSION?rev=64461&r1=64460&r2=64461&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/add-on/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/add-on/VERSION Fri Jun 17 17:01:34 2011 @@ -1 +1 @@ -2.17.22 +2.17.23 Modified: branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes?rev=64461&r1=64460&r2=64461&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes Fri Jun 17 17:01:34 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 17 16:07:30 CEST 2011 - jsuchome@suse.cz + +- check the product profile of new add-on product (fate##310730) +- 2.17.23 + +------------------------------------------------------------------- Fri Jun 3 15:41:23 CEST 2011 - locilka@suse.cz - Added support for clonning system configuration (used add-on Modified: branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp?rev=64461&r1=64460&r2=64461&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp Fri Jun 17 17:01:34 2011 @@ -27,6 +27,7 @@ import "Sequencer"; import "SourceManager"; import "PackageSystem"; +import "ProductProfile"; import "SuSEFirewall"; import "Stage"; import "Wizard"; @@ -718,12 +719,29 @@ return ret; } +/** + * Check new product compliance; may abort the installation + */ +symbol CheckCompliance () { + + if (ProductProfile::CheckCompliance (AddOnProduct::src_id)) + { + return `next; + } + else + { + return `abort; + } + +} + symbol RunWizard() { map aliases = $[ "media" : ``(MediaSelect ()), // "catalog" : ``(CatalogSelect ()), // "product" : ``(ProductSelect ()), "install_product" : ``(InstallProduct ()), + "check_compliance": ``(CheckCompliance ()), ]; map sequence = $[ @@ -745,8 +763,12 @@ // ], "install_product" : $[ `abort : `abort, + `next : "check_compliance", + `finish : "check_compliance", + ], + "check_compliance" : $[ + `abort : `abort, `next : `next, - `finish : `next, ], ]; return Sequencer::Run(aliases, sequence); Modified: branches/SuSE-Code-11-SP2-Branch/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on/yast2-add-on.spec.in?rev=64461&r1=64460&r2=64461&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/add-on/yast2-add-on.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/add-on/yast2-add-on.spec.in Fri Jun 17 17:01:34 2011 @@ -2,8 +2,8 @@ @HEADER@ Requires: autoyast2-installation -# PackagesUI module, BNC #469320 -Requires: yast2 >= 2.15.58 +# ProductProfile.ycp +Requires: yast2 >= 2.17.98 Requires: yast2-installation Requires: yast2-country @@ -13,7 +13,7 @@ Requires: yast2-storage >= 2.16.1 BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-installation yast2-packager yast2-storage -BuildRequires: yast2 >= 2.15.22 +BuildRequires: yast2 >= 2.17.98 # splitted from yast2-installation Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org