Author: locilka Date: Wed Aug 27 12:52:41 2008 New Revision: 50401 URL: http://svn.opensuse.org/viewcvs/yast?rev=50401&view=rev Log: - Using buil-in getenv instead of artificial simulation of it. - Adjusted RPM dependencies. - [Cancel] instead of [Abort]. - 2.17.1 Modified: trunk/inetd/VERSION trunk/inetd/package/yast2-inetd.changes trunk/inetd/src/dialogs.ycp trunk/inetd/src/helps.ycp trunk/inetd/src/routines.ycp trunk/inetd/yast2-inetd.spec.in Modified: trunk/inetd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/VERSION?rev=50401&r1=50400&r2=50401&view=diff ============================================================================== --- trunk/inetd/VERSION (original) +++ trunk/inetd/VERSION Wed Aug 27 12:52:41 2008 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: trunk/inetd/package/yast2-inetd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/package/yast2-inetd.changes?rev=50401&r1=50400&r2=50401&view=diff ============================================================================== --- trunk/inetd/package/yast2-inetd.changes (original) +++ trunk/inetd/package/yast2-inetd.changes Wed Aug 27 12:52:41 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Aug 27 12:49:12 CEST 2008 - locilka@suse.cz + +- Using buil-in getenv instead of artificial simulation of it. +- Adjusted RPM dependencies. +- [Cancel] instead of [Abort]. +- 2.17.1 + +------------------------------------------------------------------- Tue Aug 5 09:45:07 CEST 2008 - locilka@suse.cz - Adjusted to the newest default configurations. Modified: trunk/inetd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/dialogs.ycp?rev=50401&r1=50400&r2=50401&view=diff ============================================================================== --- trunk/inetd/src/dialogs.ycp (original) +++ trunk/inetd/src/dialogs.ycp Wed Aug 27 12:52:41 2008 @@ -313,7 +313,7 @@ */ /* These special options are available, if YAST2_INETD environment variable contains `EXPERT' */ /* The `expert_inetd' command-line parameter is implemented too. */ - if((getenv("YAST2_INETD") == "EXPERT\n") || (WFM::Args()[0]:"" == "expert_inetd")) + if((getenv("YAST2_INETD") == "EXPERT") || (WFM::Args()[0]:"" == "expert_inetd")) expert_contents = add(expert_contents, `menu("E&xpert tools", [ `item(`id(`all_rev), "&Invert Status"), @@ -391,6 +391,7 @@ Label::BackButton(), Label::FinishButton()); Wizard::HideBackButton(); + Wizard::SetAbortButton (`cancel, Label::CancelButton()); Wizard::SetScreenShotName("inetd-5-maindialog"); Modified: trunk/inetd/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/helps.ycp?rev=50401&r1=50400&r2=50401&view=diff ============================================================================== --- trunk/inetd/src/helps.ycp (original) +++ trunk/inetd/src/helps.ycp Wed Aug 27 12:52:41 2008 @@ -71,9 +71,9 @@ Click <b>Create</b> and complete the form.</p> ") + "<p><br></p>" + - _("<p><b><big>Aborting Configuration:</big></b> -Abort the configuration by pressing the <b>Abort</b> button. -If you do so, all your changes will be lost and the original configuration will remain untouched.</p> + _("<p><b><big>Canceling Configuration:</big></b> +Leave the configuration untouched by pressing the <b>Cancel</b> button. +If you do so, all your changes will be lost and the original configuration will remain.</p> "), ]; Modified: trunk/inetd/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/src/routines.ycp?rev=50401&r1=50400&r2=50401&view=diff ============================================================================== --- trunk/inetd/src/routines.ycp (original) +++ trunk/inetd/src/routines.ycp Wed Aug 27 12:52:41 2008 @@ -390,21 +390,6 @@ } /** - * Get contents of environment variable. - * @param environment name of requested variable - * @return environment variable contents - */ -define string getenv(string environment) ``{ - string command = sformat("echo $%1", environment); - map result = (map) SCR::Execute(.target.bash_output, command, []); - if(result["stdout"]:"" == "") { - return nil; - } else { - return (string) (result["stdout"]:""); - } -} - -/** * Cache for @ref IsInstalled. */ map is_installed_cache = $[]; Modified: trunk/inetd/yast2-inetd.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/inetd/yast2-inetd.spec.in?rev=50401&r1=50400&r2=50401&view=diff ============================================================================== --- trunk/inetd/yast2-inetd.spec.in (original) +++ trunk/inetd/yast2-inetd.spec.in Wed Aug 27 12:52:41 2008 @@ -4,6 +4,7 @@ BuildRequires: yast2-users perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 >= 2.13.74 Requires: yast2-packager yast2-users +Conflicts: yast2-core < 2.17.9 Provides: yast2-config-inet y2c_inet Obsoletes: yast2-config-inet y2c_inet -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org