Hello community,
here is the log from the commit of package yast2-installation
checked in at Fri Nov 10 00:45:45 CET 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-11-03 15:42:48.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2006-11-09 10:32:25.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 9 10:22:00 CET 2006 - locilka@suse.cz
+
+- Added confirmation dialog into the update workflow on the running
+ system before the update really proceeds (#219097).
+- confirmInstallation function moved from inst_doit to misc to make
+ confirmation dialog possible (#219097).
+- Set Product Name only when any Product Name found (#218720).
+- 2.14.8
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.14.7.tar.bz2
New:
----
yast2-installation-2.14.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.u5zmIF/_old 2006-11-10 00:42:33.000000000 +0100
+++ /var/tmp/diff_new_pack.u5zmIF/_new 2006-11-10 00:42:33.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.14.7)
+# spec file for package yast2-installation (Version 2.14.8)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.14.7
+Version: 2.14.8
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.14.7.tar.bz2
+Source0: yast2-installation-2.14.8.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-country yast2-devtools yast2-testsuite
Requires: yast2-slp yast2-firewall
@@ -69,7 +69,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.14.7
+%setup -n yast2-installation-2.14.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -133,6 +133,13 @@
%endif
%changelog -n yast2-installation
+* Thu Nov 09 2006 - locilka@suse.cz
+- Added confirmation dialog into the update workflow on the running
+ system before the update really proceeds (#219097).
+- confirmInstallation function moved from inst_doit to misc to make
+ confirmation dialog possible (#219097).
+- Set Product Name only when any Product Name found (#218720).
+- 2.14.8
* Fri Nov 03 2006 - locilka@suse.cz
- Preselecting already installed languages in the Language Add-On
script (FATE #301239) (#217052).
++++++ yast2-installation-2.14.7.tar.bz2 -> yast2-installation-2.14.8.tar.bz2 ++++++
++++ 1926 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.7/VERSION new/yast2-installation-2.14.8/VERSION
--- old/yast2-installation-2.14.7/VERSION 2006-11-03 15:42:52.000000000 +0100
+++ new/yast2-installation-2.14.8/VERSION 2006-11-09 10:35:51.000000000 +0100
@@ -1 +1 @@
-2.14.7
+2.14.8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.7/src/clients/inst_doit.ycp new/yast2-installation-2.14.8/src/clients/inst_doit.ycp
--- old/yast2-installation-2.14.7/src/clients/inst_doit.ycp 2006-06-26 09:10:54.000000000 +0200
+++ new/yast2-installation-2.14.8/src/clients/inst_doit.ycp 2006-11-09 13:32:34.000000000 +0100
@@ -6,7 +6,7 @@
*
* Purpose: Asks user to really do the installation/update.
*
- * $Id: inst_doit.ycp 30399 2006-04-24 11:32:42Z sh $
+ * $Id: inst_doit.ycp 34204 2006-11-09 12:32:32Z locilka $
*/
{
textdomain "installation";
@@ -17,6 +17,7 @@
import "Label";
+ include "installation/misc.ycp";
if (Mode::autoinst () && !AutoinstConfig::Confirm)
return `next;
@@ -120,93 +121,13 @@
});
}
-
- /**
- * Confirm installation or update.
- * Returns 'true' if the user confirms, 'false' otherwise.
- **/
- boolean confirmInstallation()
- {
- // Heading for confirmation popup before the installation really starts
- string heading = "<h3>" + _("Confirm Installation") + "</h3>";
-
- string body =
- // Text for confirmation popup before the installation really starts 1/3
- _("<p>All information required for the base installation is now complete.</p>")
- // Text for confirmation popup before the installation really starts 2/3
- + _("
-<p>If you continue now, partitions on your hard disk will be <b>formatted</b>
-(erasing any existing data in those partitions)
-according to the installation settings in the previous dialogs.</p>")
- // Text for confirmation popup before the installation really starts 3/3
- + _("<p>Go back and check the settings if you are unsure.</p>")
- ;
-
- string confirm_button_label = Label::InstallButton ();
-
- if ( Mode::update () )
- {
- // Heading for confirmation popup before the update really starts
- heading = "<h3>" + _("Confirm Update") + "</h3>";
-
- body =
- // Text for confirmation popup before the update really starts 1/3
- _("<p>All information required to perform an update is now complete.</p>")
- // Text for confirmation popup before the update really starts 2/3
- + _("
-<p>If you continue now, data on your hard disk will be overwritten
-according to the settings in the previous dialogs.</p>")
- // Text for confirmation popup before the update really starts 3/3
- + _("<p>Go back and check the settings if you are unsure.</p>")
- ;
-
- // Label for the button that confirms startint the installation
- confirm_button_label = _("Start &Update");
- }
-
- string heading_bg_color = "#A9CEDD";
-
- map display_info = UI::GetDisplayInfo();
- string text = display_info[ "RichTextSupportsTable" ]:false ?
- sformat( "<tr><td>%2</td></tr></table>%3",
- heading_bg_color, heading, body )
- : ( heading + body );
-
-
-
- UI::OpenDialog(
- `VBox(
- `VSpacing( 0.4 ),
- `HSpacing( 70 ), // force width
- `HBox(
- `HSpacing( 0.7 ),
- `VSpacing( 18 ), // force height
- `RichText( text ),
- `HSpacing( 0.7 )
- ),
- `HBox(
- `HStretch(),
- `PushButton(`id(`back), `opt(`default), Label::BackButton() ),
- `HStretch(),
- `PushButton(`id(`confirm), confirm_button_label ),
- `HStretch()
- )
- )
- );
-
- symbol button = (symbol) UI::UserInput();
- UI::CloseDialog();
-
- return ( button == `confirm );
- }
-
-
-
//
// main()
//
ConfirmLicenses ();
+ // function in installation/misc.ycp
+ // bugzilla #219097
boolean confirmed = confirmInstallation();
if ( confirmed )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.7/src/clients/inst_proposal.ycp new/yast2-installation-2.14.8/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.14.7/src/clients/inst_proposal.ycp 2006-10-09 13:28:35.000000000 +0200
+++ new/yast2-installation-2.14.8/src/clients/inst_proposal.ycp 2006-11-09 13:32:34.000000000 +0100
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: inst_proposal.ycp 33271 2006-10-09 11:28:31Z locilka $
+ * $Id: inst_proposal.ycp 34204 2006-11-09 12:32:32Z locilka $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -1193,6 +1193,14 @@
{
input = WFM::CallFunction("inst_doit", [] );
}
+ // bugzilla #219097, yast2-update on running system
+ else if ( Stage::stage () == "normal" )
+ {
+ if (! confirmInstallation()) {
+ y2milestone ("Update not confirmed, returning back...");
+ input = nil;
+ }
+ }
if ( input == `next )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.7/src/include/misc.ycp new/yast2-installation-2.14.8/src/include/misc.ycp
--- old/yast2-installation-2.14.7/src/include/misc.ycp 2006-10-09 16:09:04.000000000 +0200
+++ new/yast2-installation-2.14.8/src/include/misc.ycp 2006-11-09 13:34:58.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: misc.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: misc.ycp 34206 2006-11-09 12:34:57Z locilka $
*
*/
@@ -24,6 +24,7 @@
import "Installation";
import "Mode";
import "ProductControl";
+import "Label";
void InjectFile (string filename) {
y2milestone("InjectFile: <%1>", filename );
@@ -61,5 +62,86 @@
}
+ // moved from clients/inst_doit.ycp
+ // to fix bug #219097
+
+ /**
+ * Confirm installation or update.
+ * Returns 'true' if the user confirms, 'false' otherwise.
+ **/
+ boolean confirmInstallation()
+ {
+ // Heading for confirmation popup before the installation really starts
+ string heading = "<h3>" + _("Confirm Installation") + "</h3>";
+
+ string body =
+ // Text for confirmation popup before the installation really starts 1/3
+ _("<p>All information required for the base installation is now complete.</p>")
+ // Text for confirmation popup before the installation really starts 2/3
+ + _("
+<p>If you continue now, partitions on your hard disk will be <b>formatted</b>
+(erasing any existing data in those partitions)
+according to the installation settings in the previous dialogs.</p>")
+ // Text for confirmation popup before the installation really starts 3/3
+ + _("<p>Go back and check the settings if you are unsure.</p>")
+ ;
+
+ string confirm_button_label = Label::InstallButton ();
+
+ if ( Mode::update () )
+ {
+ // Heading for confirmation popup before the update really starts
+ heading = "<h3>" + _("Confirm Update") + "</h3>";
+
+ body =
+ // Text for confirmation popup before the update really starts 1/3
+ _("<p>All information required to perform an update is now complete.</p>")
+ // Text for confirmation popup before the update really starts 2/3
+ + _("
+<p>If you continue now, data on your hard disk will be overwritten
+according to the settings in the previous dialogs.</p>")
+ // Text for confirmation popup before the update really starts 3/3
+ + _("<p>Go back and check the settings if you are unsure.</p>")
+ ;
+
+ // Label for the button that confirms startint the installation
+ confirm_button_label = _("Start &Update");
+ }
+
+ string heading_bg_color = "#A9CEDD";
+
+ map display_info = UI::GetDisplayInfo();
+ string text = display_info[ "RichTextSupportsTable" ]:false ?
+ sformat( "<tr><td>%2</td></tr></table>%3",
+ heading_bg_color, heading, body )
+ : ( heading + body );
+
+
+
+ UI::OpenDialog(
+ `VBox(
+ `VSpacing( 0.4 ),
+ `HSpacing( 70 ), // force width
+ `HBox(
+ `HSpacing( 0.7 ),
+ `VSpacing( 18 ), // force height
+ `RichText( text ),
+ `HSpacing( 0.7 )
+ ),
+ `HBox(
+ `HStretch(),
+ `PushButton(`id(`back), `opt(`default), Label::BackButton() ),
+ `HStretch(),
+ `PushButton(`id(`confirm), confirm_button_label ),
+ `HStretch()
+ )
+ )
+ );
+
+ symbol button = (symbol) UI::UserInput();
+ UI::CloseDialog();
+
+ return ( button == `confirm );
+ }
} //end of include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.14.7/src/modules/Product.ycp new/yast2-installation-2.14.8/src/modules/Product.ycp
--- old/yast2-installation-2.14.7/src/modules/Product.ycp 2006-08-10 10:05:19.000000000 +0200
+++ new/yast2-installation-2.14.8/src/modules/Product.ycp 2006-11-09 13:32:34.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Product data
* Authors: Klaus Kaempf
*
- * $Id: Product.ycp 32270 2006-08-09 12:59:35Z jsrain $
+ * $Id: Product.ycp 34204 2006-11-09 12:32:32Z locilka $
*/
{
@@ -74,7 +74,8 @@
y2milestone ("Looking for base products");
list