Author: jsuchome Date: Fri Jun 26 15:23:16 2009 New Revision: 57772 URL: http://svn.opensuse.org/viewcvs/yast?rev=57772&view=rev Log: - manual installation of 32bit packages packages no longer needed (bnc#354164) - 2.18.2 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/src/Kerberos.ycp trunk/kerberos-client/src/dialogs.ycp trunk/kerberos-client/src/kerberos.ycp Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=57772&r1=57771&r2=57772&view=diff ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Fri Jun 26 15:23:16 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-kerberos-client.changes?rev=57772&r1=57771&r2=57772&view=diff ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Fri Jun 26 15:23:16 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 26 14:59:58 CEST 2009 - jsuchome@suse.cz + +- manual installation of 32bit packages packages no longer needed + (bnc#354164) +- 2.18.2 + +------------------------------------------------------------------- Thu Jun 18 09:16:18 CEST 2009 - jsuchome@suse.cz - 2.18.1 Modified: trunk/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/Kerberos.ycp?rev=57772&r1=57771&r2=57772&view=diff ============================================================================== --- trunk/kerberos-client/src/Kerberos.ycp (original) +++ trunk/kerberos-client/src/Kerberos.ycp Fri Jun 26 15:23:16 2009 @@ -16,7 +16,6 @@ textdomain "kerberos"; -import "Arch"; import "FileUtils"; import "Hostname"; import "Label"; @@ -85,22 +84,6 @@ // packages to install (openssh etc.) global list<string> packages = []; -// packages to install for specific arhitectures (#49808) -global map arch_packages = $[ - "krb5" : $[ - "ia64" : [ "krb5-x86" ], - "ppc64" : [ "krb5-32bit" ], - "s390_64" : [ "krb5-32bit" ], - "x86_64" : [ "krb5-32bit" ], - ], - "pam_krb5" : $[ - "ia64" : [ "pam_krb5-x86" ], - "ppc64" : [ "pam_krb5-32bit" ], - "s390_64" : [ "pam_krb5-32bit" ], - "x86_64" : [ "pam_krb5-32bit" ], - ], -]; - // if DNS can be used for retrieving configuration data global boolean dns_available = false; @@ -726,27 +709,12 @@ } /** - * 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 required packages for auto-installation * @return map of packages to be installed and to be removed */ global define map AutoPackages() { return ($[ - "install": UpdatedArchPackages (required_packages), + "install": required_packages, "remove": [] ]); } Modified: trunk/kerberos-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/dialogs.ycp?rev=57772&r1=57771&r2=57772&view=diff ============================================================================== --- trunk/kerberos-client/src/dialogs.ycp (original) +++ trunk/kerberos-client/src/dialogs.ycp Fri Jun 26 15:23:16 2009 @@ -382,7 +382,7 @@ } if (result == `next && use_pam_krb) { - if (!Package::InstallAll (Kerberos::UpdatedArchPackages (Kerberos::required_packages))) + if (!Package::InstallAll (Kerberos::required_packages)) { result = `not_next; use_pam_krb = false; Modified: trunk/kerberos-client/src/kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/src/kerberos.ycp?rev=57772&r1=57771&r2=57772&view=diff ============================================================================== --- trunk/kerberos-client/src/kerberos.ycp (original) +++ trunk/kerberos-client/src/kerberos.ycp Fri Jun 26 15:23:16 2009 @@ -213,7 +213,7 @@ */ define boolean KerberosWrite () { - if (!Package::InstallAll (Kerberos::UpdatedArchPackages (Kerberos::required_packages))) + if (!Package::InstallAll (Kerberos::required_packages)) return false; return Kerberos::Write (); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org