Author: jsuchome Date: Fri Jun 26 15:23:46 2009 New Revision: 57775 URL: http://svn.opensuse.org/viewcvs/yast?rev=57775&view=rev Log: - manual installation of 32bit packages packages no longer needed (bnc#354164) - 2.18.7 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/Users.pm trunk/users/src/inst_user_first.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=57775&r1=57774&r2=57775&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Jun 26 15:23:46 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=57775&r1=57774&r2=57775&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Jun 26 15:23:46 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 26 15:13:55 CEST 2009 - jsuchome@suse.cz + +- manual installation of 32bit packages packages no longer needed + (bnc#354164) +- 2.18.7 + +------------------------------------------------------------------- Fri Jun 26 13:47:50 CEST 2009 - jsuchome@suse.cz - YaPI: enable returing set of attributes (UsersGet, UserGet) Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=57775&r1=57774&r2=57775&view=diff ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Fri Jun 26 15:23:46 2009 @@ -199,7 +199,6 @@ ##------------------- global imports YaST::YCP::Import ("SCR"); -YaST::YCP::Import ("Arch"); YaST::YCP::Import ("Autologin"); YaST::YCP::Import ("Call"); YaST::YCP::Import ("Directory"); @@ -4245,23 +4244,6 @@ return $result; } -# return the list of packages needed for crypted home directories -# (+ architecture specific, see bnc#392028) -sub cryptconfig_packages { - - my $arch = Arch->architecture (); - my @ret = ("cryptconfig"); - return \@ret if $arch eq "i386"; - my %dependency = ( - "ia64" => "-x86", - "ppc64" => "-64bit", - "s390_64" => "-32bit", - "x86_64" => "-32bit" - ); - push @ret, "cryptconfig".$dependency{$arch}; - return \@ret; -} - ##------------------------------------ BEGIN { $TYPEINFO{Write} = ["function", "string"]; } sub Write { @@ -4568,7 +4550,7 @@ } } if (%users_with_crypted_dir) { - Package->InstallAll (cryptconfig_packages ()); + Package->Install ("cryptconfig"); } # Write passwords Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?rev=57775&r1=57774&r2=57775&view=diff ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Fri Jun 26 15:23:46 2009 @@ -7,7 +7,6 @@ * $Id$ */ { - import "Arch"; import "Directory"; import "GetInstArgs"; import "Label"; @@ -28,8 +27,6 @@ map display_info = UI::GetDisplayInfo (); boolean text_mode = display_info["TextMode"]:false; - string arch = Arch::architecture (); - boolean check_CA_constraints = (ProductFeatures::GetBooleanFeature ("globals","root_password_ca_check") == true); @@ -61,24 +58,6 @@ // check if LDAP/Kerberos are available UsersSimple::CheckNetworkMethodsAvailability (); - // helper function to se package for installation, together with - // architecture dependent version - void install_package (string package) { - - Pkg::ResolvableInstall (package, `package); - if (issubstring (package, "yast")) - return; - map dependency = $[ - "ia64" : "-x86", - "ppc64" : "-64bit", - "s390_64" : "-32bit", - "x86_64" : "-32bit", - ]; - string arch_package = package + dependency[arch]:""; - if (arch_package != package && Package::Available(arch_package) == true) - Pkg::ResolvableInstall (package, `package); - } - // do not open package progress wizard window boolean progress_orig = Progress::set (false); @@ -808,13 +787,13 @@ ], ]; foreach (string package, required_packages[auth_method]:[], { - install_package (package); + Pkg::ResolvableInstall (package, `package); }); } if (use_kerberos) { foreach (string package, ["pam_krb5", "krb5", "krb5-client"], { - install_package (package); + Pkg::ResolvableInstall (package, `package); }); } if (root_pw) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org