Author: jsuchome Date: Fri Jun 26 15:23:34 2009 New Revision: 57774 URL: http://svn.opensuse.org/viewcvs/yast?rev=57774&view=rev Log: - manual installation of 32bit packages packages no longer needed (bnc#354164) - 2.18.0 Modified: trunk/fingerprint-reader/VERSION trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes trunk/fingerprint-reader/src/FingerprintReader.ycp trunk/fingerprint-reader/src/dialogs.ycp Modified: trunk/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/VERSION?rev=57774&r1=57773&r2=57774&view=diff ============================================================================== --- trunk/fingerprint-reader/VERSION (original) +++ trunk/fingerprint-reader/VERSION Fri Jun 26 15:23:34 2009 @@ -1 +1 @@ -2.17.6 +2.18.0 Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes?rev=57774&r1=57773&r2=57774&view=diff ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Fri Jun 26 15:23:34 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 26 15:07:20 CEST 2009 - jsuchome@suse.cz + +- manual installation of 32bit packages packages no longer needed + (bnc#354164) +- 2.18.0 + +------------------------------------------------------------------- Fri Jun 19 12:37:32 CEST 2009 - mvidner@suse.cz - Using autodocs-cc.ami, which contains a fix for automake 1.11. Modified: trunk/fingerprint-reader/src/FingerprintReader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/FingerprintReader.ycp?rev=57774&r1=57773&r2=57774&view=diff ============================================================================== --- trunk/fingerprint-reader/src/FingerprintReader.ycp (original) +++ trunk/fingerprint-reader/src/FingerprintReader.ycp Fri Jun 26 15:23:34 2009 @@ -35,7 +35,6 @@ module "FingerprintReader"; textdomain "fingerprint-reader"; -import "Arch"; import "FileUtils"; import "Pam"; import "Popup"; @@ -56,16 +55,6 @@ */ global list<string> required_packages = ["pam_fp"]; -// packages to install for specific architectures (see e.g. #224510) -global map arch_packages = $[ - "pam_fp" : $[ - "ia64" : [ "pam_fp-x86" ], - "ppc64" : [ "pam_fp-64bit" ], - "s390_64" : [ "pam_fp-32bit" ], - "x86_64" : [ "pam_fp-32bit" ], - ], -]; - /** * Write only, used during autoinstallation. * Don't run services and SuSEconfig, it's all done at one place. @@ -251,21 +240,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 packages needed to be installed and removed during * Autoinstallation to insure module has all needed software * installed. Modified: trunk/fingerprint-reader/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/dialogs.ycp?rev=57774&r1=57773&r2=57774&view=diff ============================================================================== --- trunk/fingerprint-reader/src/dialogs.ycp (original) +++ trunk/fingerprint-reader/src/dialogs.ycp Fri Jun 26 15:23:34 2009 @@ -139,10 +139,7 @@ // temporary enable pam module } else if (ret == `next) { - if (use_pam && - !Package::InstallAll (FingerprintReader::UpdatedArchPackages ( - FingerprintReader::required_packages)) - ) + if (use_pam && !Package::InstallAll (FingerprintReader::required_packages)) { use_pam = false; UI::ChangeWidget (`id (`rd), `Value, `pamno); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org