Author: jsuchome Date: Tue Jul 31 10:46:34 2007 New Revision: 39828 URL: http://svn.opensuse.org/viewcvs/yast?rev=39828&view=rev Log: architecture specific packages, dialog cleanup Modified: trunk/fingerprint-reader/src/FingerprintReader.ycp trunk/fingerprint-reader/src/dialogs.ycp trunk/fingerprint-reader/src/helps.ycp Modified: trunk/fingerprint-reader/src/FingerprintReader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/FingerprintReader.ycp?rev=39828&r1=39827&r2=39828&view=diff ============================================================================== --- trunk/fingerprint-reader/src/FingerprintReader.ycp (original) +++ trunk/fingerprint-reader/src/FingerprintReader.ycp Tue Jul 31 10:46:34 2007 @@ -35,6 +35,7 @@ module "FingerprintReader"; textdomain "fingerprint-reader"; +import "Arch"; import "Pam"; import "Popup"; import "Progress"; @@ -48,10 +49,19 @@ /** * Required packages for this module to operate - * FIXME UpdatedArchPackages ??? */ global list<string> required_packages = ["pam_thinkfinger"]; +// packages to install for specific architectures (see e.g. #224510) +global map arch_packages = $[ + "pam_thinkfinger" : $[ + "ia64" : [ "pam_thinkfinger-x86" ], + "ppc64" : [ "pam_thinkfinger-64bit" ], + "s390_64" : [ "pam_thinkfinger-32bit" ], + "x86_64" : [ "pam_thinkfinger-32bit" ], + ], +]; + /** * Write only, used during autoinstallation. * Don't run services and SuSEconfig, it's all done at one place. @@ -224,6 +234,21 @@ } /** + * 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=39828&r1=39827&r2=39828&view=diff ============================================================================== --- trunk/fingerprint-reader/src/dialogs.ycp (original) +++ trunk/fingerprint-reader/src/dialogs.ycp Tue Jul 31 10:46:34 2007 @@ -120,6 +120,7 @@ Wizard::HideAbortButton (); UI::ChangeWidget (`id (`import_dir), `Enabled, use_pam); + UI::ChangeWidget (`id (`browse), `Enabled, use_pam); any ret = nil; while (true) { @@ -131,6 +132,7 @@ { use_pam = (ret == `pamyes); UI::ChangeWidget (`id (`import_dir), `Enabled, use_pam); + UI::ChangeWidget (`id (`browse), `Enabled, use_pam); } if (ret == `abort || ret == `cancel || ret == `back) { @@ -157,11 +159,14 @@ continue; } if (use_pam && - !Package::InstallAll (FingerprintReader::required_packages)) + !Package::InstallAll (FingerprintReader::UpdatedArchPackages ( + FingerprintReader::required_packages)) + ) { use_pam = false; UI::ChangeWidget (`id (`rd), `Value, `pamno); UI::ChangeWidget (`id (`import_dir), `Enabled, use_pam); + UI::ChangeWidget (`id (`browse), `Enabled, use_pam); continue; } if (use_pam != FingerprintReader::use_pam || Modified: trunk/fingerprint-reader/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/helps.ycp?rev=39828&r1=39827&r2=39828&view=diff ============================================================================== --- trunk/fingerprint-reader/src/helps.ycp (original) +++ trunk/fingerprint-reader/src/helps.ycp Tue Jul 31 10:46:34 2007 @@ -37,7 +37,7 @@ map HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<p><b><big>Initializing fingerprint-reader Configuration</big></b><br> + "read" : _("<p><b><big>Initializing Fingerprint Reader Configuration</big></b><br> Please wait...<br></p> ") + @@ -47,7 +47,7 @@ "), /* Write dialog help 1/2 */ - "write" : _("<p><b><big>Saving fingerprint-reader Configuration</big></b><br> + "write" : _("<p><b><big>Saving Fingerprint Reader Configuration</big></b><br> Please wait...<br></p> ") + @@ -58,61 +58,6 @@ </p> "), - /* Summary dialog help 1/3 */ - "summary" : _("<p><b><big>FingerprintReader Configuration</big></b><br> -Configure fingerprint-reader here.<br></p> -") + - - /* Summary dialog help 2/3 */ - _("<p><b><big>Adding a fingerprint-reader:</big></b><br> -Choose an fingerprint-reader from the list of detected fingerprint-readers. -If your fingerprint-reader was not detected, use <b>Other (not detected)</b>. -Then press <b>Configure</b>.</p> -") + - - /* Summary dialog help 3/3 */ - _("<p><b><big>Editing or Deleting:</big></b><br> -If you press <b>Edit</b>, an additional dialog in which to change -the configuration opens.</p> -"), - - /* Ovreview dialog help 1/3 */ - "overview" : _("<p><b><big>FingerprintReader Configuration Overview</big></b><br> -Obtain an overview of installed fingerprint-readers. Additionally -edit their configurations.<br></p> -") + - - /* Ovreview dialog help 2/3 */ -_("<p><b><big>Adding a fingerprint-reader:</big></b><br> -Press <b>Add</b> to configure a fingerprint-reader.</p>") + - - /* Ovreview dialog help 3/3 */ -_("<p><b><big>Editing or Deleting:</big></b><br> -Choose a fingerprint-reader to change or remove. -Then press <b>Edit</b> or <b>Delete</b> as desired.</p> -"), - - /* Configure1 dialog help 1/2 */ - "c1" : _("<p><b><big>Configuration Part One</big></b><br> -Press <b>Next</b> to continue. -<br></p>") + - - /* Configure1 dialog help 2/2 */ -_("<p><b><big>Selecting Something</big></b><br> -It is not possible. You must code it first. :-) -</p>"), - - /* Configure2 dialog help 1/2 */ - "c2" : _("<p><b><big>Configuration Part Two</big></b><br> -Press <b>Next</b> to continue. -<br></p> -") + - - /* Configure2 dialog help 2/2 */ -_("<p><b><big>Selecting Something</big></b><br> -It is not possible. You must code it first. :-) -</p>"), - ]; /* EOF */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org