Author: jsuchome Date: Fri Jun 26 15:23:09 2009 New Revision: 57771 URL: http://svn.opensuse.org/viewcvs/yast?rev=57771&view=rev Log: - manual installation of 32bit packages packages no longer needed (bnc#354164) - 2.18.4 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=57771&r1=57770&r2=57771&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Fri Jun 26 15:23:09 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=57771&r1=57770&r2=57771&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Jun 26 15:23:09 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 25 22:12:56 CEST 2009 - jsuchome@suse.cz + +- manual installation of 32bit packages packages no longer needed + (bnc#354164) +- 2.18.4 + +------------------------------------------------------------------- Mon Jun 8 14:45:51 CEST 2009 - jsuchome@suse.cz - fixed handling of uniqueMember option (bnc#509874) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=57771&r1=57770&r2=57771&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Fri Jun 26 15:23:09 2009 @@ -13,7 +13,6 @@ module "Ldap"; textdomain "ldap-client"; - import "Arch"; import "Autologin"; import "Directory"; import "FileUtils"; @@ -278,23 +277,6 @@ // if /etc/passwd was read boolean passwd_read = false; - // packages to install for specific arhitectures (#49808) - global map arch_packages = $[ - "pam_ldap" : $[ - "ia64" : [ "pam_ldap-x86" ], - "ppc64" : [ "pam_ldap-32bit" ], - "s390_64" : [ "pam_ldap-32bit" ], - "x86_64" : [ "pam_ldap-32bit" ], - ], - "nss_ldap" : $[ - "ia64" : [ "nss_ldap-x86" ], - "ppc64" : [ "nss_ldap-32bit" ], - "s390_64" : [ "nss_ldap-32bit" ], - "x86_64" : [ "nss_ldap-32bit" ], - - ] - ]; - /** * if pam_mkhomedir is set in /etc/pam.d/commond-session */ @@ -370,21 +352,6 @@ } /** - * Return list of architecture specific packages (derived from package list - * given as parameter) merged with the packages in parameter - */ - global define list<string> UpdatedArchPackages (list<string> packages) { - - list<string> ret = packages; - string arch = Arch::architecture (); - - foreach (string package, packages, { - ret = (list<string>) union (ret, arch_packages[package,arch]:[]); - }); - return ret; - } - - /** * Return needed packages and packages to be removed * during autoinstallation. * @return map of lists. @@ -394,9 +361,7 @@ if (start) required_packages = (list<string>) union (required_packages, ["pam_ldap", "nss_ldap"]); - list<string> install_pkgs = UpdatedArchPackages (required_packages); - list remove_pkgs = []; - return ($["install": install_pkgs, "remove": remove_pkgs]); + return ($["install": required_packages, "remove": []]); } @@ -2616,8 +2581,7 @@ block<boolean> abort = ``{ return false; }; - list<string> needed_packages = - UpdatedArchPackages (["pam_ldap", "nss_ldap"]); + list<string> needed_packages = ["pam_ldap", "nss_ldap"]; if (_start_autofs && !Package::Installed("autofs")) { Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=57771&r1=57770&r2=57771&view=diff ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Fri Jun 26 15:23:09 2009 @@ -430,8 +430,7 @@ } } - list<string> needed_packages = - Ldap::UpdatedArchPackages (["pam_ldap", "nss_ldap"]); + list<string> needed_packages = ["pam_ldap", "nss_ldap"]; if (start && !Package::InstalledAll (needed_packages)) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org