Attachment 47530 Details for Bug 112900

[patch] patch for /usr/share/YaST2/clients/inst_timezone.ycp

inst_timezone.diff (text/plain), 2.08 KB, created by Jiří Suchomel on 2005-08-25 11:54:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2005-08-25 11:54:26 UTC

Size: 2.08 KB

patch

obsolete

>Index: inst_timezone.ycp
>===================================================================
>--- inst_timezone.ycp	(revision 25129)
>+++ inst_timezone.ycp	(working copy)
>@@ -261,13 +261,20 @@
> 	hwclock = ( AutoinstGeneral::Clock["hwclock"]:"" == "UTC" ) ? "-u"  : "--localtime";
>     }
> 
>-    string date = "";
>-
>-    if (Mode::config () || Mode::mode () == "firstboot")
>+    // Initially set the current timezone to establish a consistent state.
>+    //
>+    integer sel = 0;
>+    if (Mode::config ())
>     {
>-	Wizard::HideAbortButton();
>+	import "AutoinstGeneral";
>+	sel = Timezone::Set (AutoinstGeneral::Clock["timezone"]:"", true);
>     }
>+    else
>+    {
>+	sel = Timezone::Set (timezone, true);
>+    }
> 
>+
>     boolean utc_only = Timezone::utc_only ();
>     y2milestone( "utc_only %1", utc_only );
> 
>@@ -277,7 +284,7 @@
> 
>     // Assign system date and time.
>     //
>-    date = Timezone::GetDateTime(true, false);//true);
>+    string date = Timezone::GetDateTime(true, false);//true);
> 
>     // build up timezone selection box
>     //
>@@ -371,9 +378,14 @@
> If the current time is not correct, use <b>Change Time or Date</b> to adjust it.
> </p>");
> 
>+    if (Mode::config () || Mode::mode () == "firstboot")
>+    {
>+	Wizard::HideAbortButton();
>+    }
>+
>     // Screen title for timezone screen
>     Wizard::SetContents (_("Clock and Time Zone"), contents,
>-			 help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next() );
>+	help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next());
> 
>     Wizard::SetDesktopIcon ("timezone");
>     if ( Stage::initial () || Stage::firstboot ())
>@@ -381,20 +393,6 @@
> 	Wizard::SetTitleIcon ("yast-timezone");
>     }
> 
>-
>-    // Initially set the current timezone to establish a consistent state.
>-    //
>-    integer sel = 0;
>-    if (Mode::config ())
>-    {
>-	import "AutoinstGeneral";
>-	sel = Timezone::Set (AutoinstGeneral::Clock["timezone"]:"", true);
>-    }
>-    else
>-    {
>-	sel = Timezone::Set (timezone, true);
>-    }
>-
>     symbol hwclock_s = (hwclock=="-u") ? `hwclock_utc : `hwclock_localtime;
>     symbol hwclock_s_old = hwclock_s;
>     hwclock_s_initial = hwclock_s;

Actions: View | Diff

Attachments on bug 112900: 47502 | 47530