Author: locilka Date: Mon Apr 20 16:38:47 2009 New Revision: 56863 URL: http://svn.opensuse.org/viewcvs/yast?rev=56863&view=rev Log: - Removing zen-updater package when disabling ZMD during installation (FATE #303671). - 2.13.215 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/inst_congratulate.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/installation/VERSION?rev=56863&r1=56862&r2=56863&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/VERSION Mon Apr 20 16:38:47 2009 @@ -1 +1 @@ -2.13.214 +2.13.215 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes?rev=56863&r1=56862&r2=56863&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes Mon Apr 20 16:38:47 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 20 16:29:40 CEST 2009 - locilka@suse.cz + +- Removing zen-updater package when disabling ZMD during + installation (FATE #303671). +- 2.13.215 + +------------------------------------------------------------------- Fri Apr 3 15:54:35 CEST 2009 - locilka@suse.cz - Adjusted BuildRequires, yast2-packager is newly required for not Modified: branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/inst_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/inst_congratulate.ycp?rev=56863&r1=56862&r2=56863&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/inst_congratulate.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/src/clients/inst_congratulate.ycp Mon Apr 20 16:38:47 2009 @@ -57,7 +57,10 @@ // #302495: Switching ZMD off // by default, the checkbox is not visible string zmd_service_name = "novell-zmd"; - string zmd_package_name = "zmd"; + // FATE #303671: Disable Updater Applet If ZENworks is Disabled During Installation + list <string> zmd_package_names = ["zmd", "zen-updater"]; + list <string> zmd_remove_packages = ["zen-updater"]; + term check_box_turnoff_zmd = `Empty(); string turnoff_zmd_help= ""; @@ -70,7 +73,14 @@ // not by default boolean turnoff_zmd_default_state = (argmap["zmd_turnoff_default_state"]:"no" == "yes"); - boolean zmd_installed = Package::Installed (zmd_package_name); + boolean zmd_installed = false; + + foreach (string one_package, zmd_package_names, { + if (Package::Installed (one_package)) { + zmd_installed = true; + break; + } + }); // don't check for state a service that is not installed boolean zmd_enabled_or_running = (zmd_installed && (Service::Enabled (zmd_service_name) || Service::Status (zmd_service_name) == 0)); y2milestone ("ZMD Installed: %1, Enabled/Running: %2", zmd_installed, zmd_enabled_or_running); @@ -198,6 +208,16 @@ void StopAndDisableZMD () { y2milestone ("Stopping service: %1 -> %2", zmd_service_name, Service::Stop (zmd_service_name)); y2milestone ("Disabling service: %1 -> %2", zmd_service_name, Service::Disable (zmd_service_name)); + + // Choose only the currently installed packages + list <string> packages_to_remove = filter (string one_package, zmd_remove_packages, { + return Package::Installed (one_package); + }); + + // FATE #303671: Disable Updater Applet If ZENworks is Disabled During Installation + if (size (packages_to_remove) > 0) { + y2milestone ("Removing packages %1: %2", packages_to_remove, Package::DoRemove (packages_to_remove)); + } } Wizard::SetContents (caption, contents, help, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org