Author: jsuchome Date: Wed Jun 15 11:38:48 2011 New Revision: 64383 URL: http://svn.opensuse.org/viewcvs/yast?rev=64383&view=rev Log: revert ProductProfile changes (SLES feature) Modified: trunk/installation/src/clients/inst_system_analysis.ycp trunk/installation/src/inst_finish/copy_files_finish.ycp Modified: trunk/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_system_analysis.ycp?rev=64383&r1=64382&r2=64383&view=diff ============================================================================== --- trunk/installation/src/clients/inst_system_analysis.ycp (original) +++ trunk/installation/src/clients/inst_system_analysis.ycp Wed Jun 15 11:38:48 2011 @@ -22,7 +22,6 @@ import "Popup"; import "Product"; import "Progress"; -import "ProductProfile"; import "Report"; import "Storage"; import "StorageControllers"; @@ -211,14 +210,6 @@ return true; } - boolean system_compliant = true; - - boolean CheckSystemCompliance () { - - system_compliant = ProductProfile::CheckCompliance (nil); - return system_compliant; - } - // <-- Function definitions Wizard::SetContents (_("Analyzing the Computer"), `Empty (), "", false, false); @@ -314,19 +305,6 @@ actions_functions = add (actions_functions, InitInstallationRepositories); visible_icons = add (visible_icons, "32x32/apps/yast-package-manager.png"); -// FIXME only show when profiles are available? or do as hidden action only? - -// ckeck for base product only once -if (ProductProfile::all_profiles == []) -{ - // TRANSLATORS: progress step - actions_todo = add (actions_todo, _("Check System Compliance")); - // TRANSLATORS: progress step - actions_doing = add (actions_doing, _("Checking System Compliance...")); - actions_functions = add (actions_functions, CheckSystemCompliance); - visible_icons = add (visible_icons, "32x32/apps/apparmor_view_profile.png"); -} - Progress::NewProgressIcons ( // TRANSLATORS: dialog caption _("System Probing"), @@ -371,10 +349,6 @@ return `abort; } -if (!system_compliant) { - return `abort; -} - y2milestone ("Have Linux: %1, Offer Update: %2", InstData::have_linux, InstData::offer_update); return `next; Modified: trunk/installation/src/inst_finish/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/copy_files_finish.ycp?rev=64383&r1=64382&r2=64383&view=diff ============================================================================== --- trunk/installation/src/inst_finish/copy_files_finish.ycp (original) +++ trunk/installation/src/inst_finish/copy_files_finish.ycp Wed Jun 15 11:38:48 2011 @@ -22,7 +22,6 @@ import "Directory"; import "Packages"; import "ProductControl"; -import "ProductProfile"; import "FileUtils"; import "String"; import "WorkflowManager"; @@ -186,23 +185,6 @@ ); } - // copy all product profiles to the installed system (fate#310730) - if (ProductProfile::all_profiles != []) - { - string target_dir = sformat ("%1/etc/productprofiles.d", Installation::destdir); - if (!FileUtilis::Exists (target_dir)) - { - SCR::Execute (.target.mkdir, target_dir); - } - foreach (string profile, ProductProfile::all_profiles, { - y2milestone ("Copying '%1' to %2", profile, target_dir); - WFM::Execute (.local.bash, - sformat ("/bin/cp -a '%1' '%2/'", profile, target_dir); - ); - }); - } - - // List of files used as additional workflow definitions CopyAllWorkflowFiles(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org