Hello community,
here is the log from the commit of package yast2-installation
checked in at Fri Apr 6 00:14:43 CEST 2007.
--------
--- yast2-installation/yast2-installation.changes 2007-03-28 16:20:18.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2007-04-05 17:32:06.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Apr 5 13:34:48 CEST 2007 - locilka@suse.cz
+
+- Using function PackagesUI::ConfirmLicenses() instead of
+ maintaining own code with almost the same functionality (#256627)
+- Adjusted RPM dependencies
+- Unified inst_startup UI to use the Progress library instead of
+ sequence of busy pop-ups.
+- Unified inst_system_analysis UI to use the Progress library
+ instead of empty dialog.
+- 2.15.17
+
+-------------------------------------------------------------------
+Wed Apr 4 10:35:55 CEST 2007 - locilka@suse.cz
+
+- Removed IPv6 proposal from installation control file. IPv6
+ proposal has been merged into Network Mode proposal (#260261).
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.15.16.tar.bz2
New:
----
yast2-installation-2.15.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.P29311/_old 2007-04-06 00:14:19.000000000 +0200
+++ /var/tmp/diff_new_pack.P29311/_new 2007-04-06 00:14:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.15.16)
+# spec file for package yast2-installation (Version 2.15.17)
#
# Copyright (c) 2007 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.15.16
+Version: 2.15.17
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.15.16.tar.bz2
+Source0: yast2-installation-2.15.17.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite
BuildRequires: yast2 >= 2.15.22
@@ -29,9 +29,8 @@
# Language::selection_skipped, bugzilla #223258
Requires: yast2-country >= 2.15.0
Requires: yast2-network
-# License and AddOn modules moved to packager
-# InstShowInfo module moved to packager
-Requires: yast2-packager >= 2.15.22
+# PackagesUI::ConfirmLicenses, bugzilla #256627
+Requires: yast2-packager >= 2.15.24
# Only in inst-sys
# Requires: yast2-add-on
# Requires: yast2-mouse
@@ -84,7 +83,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-installation-2.15.16
+%setup -n yast2-installation-2.15.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -147,6 +146,18 @@
%endif
%changelog
+* Thu Apr 05 2007 - locilka@suse.cz
+- Using function PackagesUI::ConfirmLicenses() instead of
+ maintaining own code with almost the same functionality (#256627)
+- Adjusted RPM dependencies
+- Unified inst_startup UI to use the Progress library instead of
+ sequence of busy pop-ups.
+- Unified inst_system_analysis UI to use the Progress library
+ instead of empty dialog.
+- 2.15.17
+* Wed Apr 04 2007 - locilka@suse.cz
+- Removed IPv6 proposal from installation control file. IPv6
+ proposal has been merged into Network Mode proposal (#260261).
* Wed Mar 28 2007 - locilka@suse.cz
- Adjusted to use WorkflowManager instead AddOnProduct module
in some cases to make Pattern-based installation and
++++++ yast2-installation-2.15.16.tar.bz2 -> yast2-installation-2.15.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.16/src/clients/inst_doit.ycp new/yast2-installation-2.15.17/src/clients/inst_doit.ycp
--- old/yast2-installation-2.15.16/src/clients/inst_doit.ycp 2006-11-29 15:47:32.000000000 +0100
+++ new/yast2-installation-2.15.17/src/clients/inst_doit.ycp 2007-04-05 13:36:26.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Asks user to really do the installation/update.
*
- * $Id: inst_doit.ycp 34204 2006-11-09 12:32:32Z locilka $
+ * $Id: inst_doit.ycp 37333 2007-04-05 11:36:24Z locilka $
*/
{
textdomain "installation";
@@ -14,6 +14,7 @@
import "Wizard";
import "Mode";
import "AutoinstConfig";
+ import "PackagesUI";
import "Label";
@@ -22,110 +23,10 @@
if (Mode::autoinst () && !AutoinstConfig::Confirm)
return `next;
+ // old functionality replaced with this function-call
+ // bugzilla #256627
+ PackagesUI::ConfirmLicenses();
- define void ConfirmLicenses () {
- if (Mode::autoinst ())
- {
- return;
- }
- list<string> to_install = Pkg::GetPackages (`selected, true);
- map licenses = Pkg::PkgGetLicensesToConfirm (to_install);
-
- // FIXME: Remove deny_all (bug #163001)
- boolean deny_all = false;
- foreach (string package, string license, licenses, {
- if (deny_all)
- {
- Pkg::PkgTaboo (package);
- }
- else
- {
- term popup = `VBox (
- `HSpacing (80),
- // dialog heading, %1 is package name
- `Heading (sformat (_("Confirm Package License: %1"),
- package)),
- `HBox (
- `VSpacing (20),
- `RichText (`id (`lic), license)
- ),
- `HBox (
- `PushButton (`id (`help), Label::HelpButton ()),
- `HStretch (),
- // push button
- `PushButton (`id (`accept), _("I &Agree")),
- // push button
- `PushButton (`id (`deny), _("I &Disagree"))
- )
- );
- UI::OpenDialog (popup);
- symbol ret = nil;
- while (ret == nil)
- {
- ret = (symbol)UI::UserInput ();
- if (ret == `help)
- {
- ret = nil;
- // help text
-
-
-// FIXME
-// FIXME
-// Remove reference to "Disagree with all" button (bug #163001) in help text
-// --sh 2006-04-24
-// FIXME
-// FIXME
-
-
- string help = _("<p><b><big>License Confirmation</big></b><br>
-The package in the headline of the dialog requires an explicit confirmation
-of acceptance of its license.
-If you reject the license of the package, the package will not be installed.
-<br>
-To accept the license of the package, click <b>I Agree</b>.
-To reject the license of the package, click <b>I Disagree</b>.
-<br>
-To reject installation of all packages requiring confirmation of
-their licenses, click <b>I Disagree with All</b>.</p>");
- UI::OpenDialog (`HBox (
- `VSpacing (18),
- `VBox (
- `HSpacing (70),
- `RichText (help),
- `HBox (
- `HStretch (),
- // push button
- `PushButton (`id (`close), Label::CloseButton ()),
- `HStretch ()
- )
- )
- ));
- UI::UserInput ();
- UI::CloseDialog ();
- }
- }
- UI::CloseDialog ();
- if (ret != `accept)
- {
- if (ret == `deny_all)
- {
- deny_all = true;
- }
- Pkg::PkgTaboo (package);
- }
- else
- {
- Pkg::PkgMarkLicenseConfirmed (package);
- }
- }
- });
- }
-
- //
- // main()
- //
-
- ConfirmLicenses ();
// function in installation/misc.ycp
// bugzilla #219097
boolean confirmed = confirmInstallation();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.16/src/clients/inst_startup.ycp new/yast2-installation-2.15.17/src/clients/inst_startup.ycp
--- old/yast2-installation-2.15.16/src/clients/inst_startup.ycp 2006-11-29 15:47:32.000000000 +0100
+++ new/yast2-installation-2.15.17/src/clients/inst_startup.ycp 2007-04-05 17:23:30.000000000 +0200
@@ -2,18 +2,16 @@
* Module: inst_startup.ycp
*
* Authors: Mathias Kettner
- * Klaus Kaempf (initial)
- * Stefan Hundhammer (UI)
+ * Klaus Kaempf
+ * Stefan Hundhammer
+ * Lukas Ocilka
*
* Purpose:
* This module does the startup:
- * - Set hostname and domainname
- * - Determine architecture and boot mode
* - Find controllers and status enabled/disabled
* - Probe all controllers for disks
- * - Probe all disks for partition data
*
- * $Id: inst_startup.ycp 33279 2006-10-09 14:16:49Z locilka $
+ * $Id: inst_startup.ycp 37342 2007-04-05 15:23:29Z locilka $
*/
{
@@ -27,135 +25,180 @@
import "StorageDevices";
import "Kernel"; // call constructor, extract cmdline
import "Report";
+ import "Progress";
+ import "Wizard";
- y2milestone("inst_startup START");
-
-
-
- boolean popup_open = false;
- /**
- * Show feedback message in a simple dialog.
- * @param msg message to show
- **/
- define void showFeedback( string msg ) ``{
- if ( popup_open )
- {
- UI::CloseDialog();
- }
-
- /**
- * The UI normally changes the X cursor to a busy cursor anyway if the
- * YCP application isn't ready to process user input (i.e. outside
- * UI::UserInput()), but some hardware probings seem to interfere with
- * the X cursor. Thus, let's make sure we really have a busy cursor
- * while the probings are performed. Setting the busy cursor once more
- * doesn't hurt in any case.
- **/
- UI::BusyCursor();
-
- UI::OpenDialog( `VBox( `Label( msg ) ) );
- y2milestone( msg );
- popup_open = true;
- };
-
-
- /**
- * Close feedback dialog if it is open
- **/
- define void clearFeedback() ``{
- if ( popup_open )
- UI::CloseDialog();
- };
+ y2milestone ("inst_startup START");
+ // Function definitions -->
// --------------------------------------------------------------
// USB
// --------------------------------------------------------------
-
- if (!(Arch::s390 () || Arch::board_iseries ()))
- {
- // give user feedback what's happening
- showFeedback( _("Probing USB devices") );
+ boolean ActionUSB () {
Hotplug::StartUSB ();
- }
+ return true;
+ }
+
// --------------------------------------------------------------
// FireWire (ieee1394)
// --------------------------------------------------------------
-
- if (!(Arch::s390 () || Arch::board_iseries ()))
- {
- // give user feedback what's happening
- showFeedback( _("Probing FireWire devices...") );
+ boolean ActionFireWire () {
Hotplug::StartFireWire ();
- }
+ return true;
+ }
+
// --------------------------------------------------------------
// Floppy
// --------------------------------------------------------------
-
- if (!(Arch::s390 () || Arch::board_iseries ()))
- {
- // give user feedback what's happening
- showFeedback( _("Probing floppy disk devices") );
+ boolean ActionFloppyDisks () {
StorageDevices::FloppyReady ();
+
+ return true;
}
+ boolean found_controllers = true;
+
// --------------------------------------------------------------
// Hard disk controllers
// 1. Probe
// 2. Initialize (module loading)
// --------------------------------------------------------------
-
// In live_eval mode, all modules have been loaded by linuxrc. But
// they are loaded by StorageControllers::Initialize(). Well, there
// also was another reason for skipping StorageControllers::Probe ()
- // but nobody seems to remembers.
-
- boolean found_controllers = true;
-
- // give user feedback what's happening
- showFeedback( _("Probing hard disk controllers") );
- found_controllers = StorageControllers::Probe () > 0;
+ // but nobody seems to remember more.
+ // --------------------------------------------------------------
+ boolean ActionHHDControllers () {
+ found_controllers = (StorageControllers::Probe () > 0);
+ return true;
+ }
+
+ // --------------------------------------------------------------
// Don't abort or even warn if no storage controllers can be
// found. Disks might be detected even without proper knowledge
// about the controller. There's a warning below if no disks were
// found.
-
- // give user feedback what's happening
- showFeedback( _("Loading kernel modules for hard disk controllers") );
- StorageControllers::Initialize ();
-
+ // --------------------------------------------------------------
+ boolean ActionLoadModules () {
+ StorageControllers::Initialize ();
+
+ return true;
+ }
+
// --------------------------------------------------------------
// Hard disks
// --------------------------------------------------------------
+ boolean ActionHDDProbe () {
+ map targetMap = StorageDevices::Probe (true);
- // give user feedback what's happening
- showFeedback( _("Probing hard disks") );
- map targetMap = StorageDevices::Probe (true);
- if (size (targetMap) == 0)
- {
- if (found_controllers)
- {
- // error report
- Report::Error(_("No hard disks were found for the installation.
+ if (size (targetMap) == 0) {
+ if (found_controllers) {
+ // pop-up error report
+ Report::Error(_("No hard disks were found for the installation.
Please check your hardware!
"));
- }
- else
- {
- // error report
- Report::Error(_("No hard disks and no hard disk controllers were
+ } else {
+ // pop-up error report
+ Report::Error(_("No hard disks and no hard disk controllers were
found for the installation.
Check your hardware.
"));
+ }
+
+ return false;
}
+
+ return true;
+ }
- clearFeedback();
- return `cancel;
+ // <-- Function definitions
+
+ list <string> actions_todo = [];
+ list <string> actions_doing = [];
+ list actions_functions = [];
+
+ if (!(Arch::s390 () || Arch::board_iseries ())) {
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe USB devices"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing USB devices..."));
+ actions_functions = add (actions_functions, ActionUSB);
+
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe FireWire devices"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing FireWire devices..."));
+ actions_functions = add (actions_functions, ActionFireWire);
+
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe floppy disks devices"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing floppy disks devices..."));
+ actions_functions = add (actions_functions, ActionFloppyDisks);
}
- clearFeedback();
- return `next;
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe hard disk controllers"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing hard disk controllers..."));
+ actions_functions = add (actions_functions, ActionHHDControllers);
+
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Load kernel modules for hard disk controllers"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Loading kernel modules for hard disk controllers..."));
+ actions_functions = add (actions_functions, ActionLoadModules);
+
+ // TRANSLATORS: progress step
+ actions_todo = add (actions_todo, _("Probe hard disks"));
+ // TRANSLATORS: progress step
+ actions_doing = add (actions_doing, _("Probing hard disks"));
+ actions_functions = add (actions_functions, ActionHDDProbe);
+
+ // Dialog definition -->
+
+ symbol script_return = `next;
+
+ Wizard::CreateDialog ();
+ Wizard::SetTitleIcon ("yast-controller");
+
+ Progress::New (
+ // TRANSLATORS: dialog caption
+ _("Hardware Probing"),
+ " ",
+ size (actions_todo),
+ actions_todo,
+ actions_doing,
+ // TRANSLATORS: dialog help
+ _("Please wait while computer hardware is being probed...")
+ );
+
+ // <-- Dialog definition
+
+ foreach (any run_function, actions_functions, {
+ Progress::NextStage();
+
+ y2milestone ("Running function: %1", run_function);
+
+ boolean () run_this = (boolean()) (run_function);
+ boolean ret = run_this();
+
+ y2milestone ("Function %1 returned %2", run_function, ret);
+
+ // Failed
+ if (ret != true) {
+ script_return = `cancel;
+ break;
+ }
+ });
+
+ Progress::Finish();
+
+ Wizard::CloseDialog();
+
+ return script_return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.16/src/clients/inst_system_analysis.ycp new/yast2-installation-2.15.17/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.15.16/src/clients/inst_system_analysis.ycp 2007-03-02 15:57:12.000000000 +0100
+++ new/yast2-installation-2.15.17/src/clients/inst_system_analysis.ycp 2007-04-05 17:24:27.000000000 +0200
@@ -3,8 +3,9 @@
* Package: Installation
* Summary: Installation mode selection, system analysis
* Authors: Jiri Srain
+ * Lukas Ocilka
*
- * $Id: inst_system_analysis.ycp 36670 2007-03-02 14:57:10Z locilka $
+ * $Id: inst_system_analysis.ycp 37343 2007-04-05 15:24:26Z locilka $
*
*/
@@ -29,6 +30,7 @@
import "Storage";
import "Update";
import "Wizard";
+import "Progress";
include "installation/misc.ycp";
include "packager/storage_include.ycp";
@@ -222,23 +224,49 @@
}
}
-// FIXME copy-paste from inst_mode
+Progress::New (
+ // TRANSLATORS: dialog caption
+ _("System Probing"),
+ " ",
+ 2,
+ [
+ // TRANSLATORS: progress step
+ _("Evaluate update"),
+ // TRANSLATORS: progress step
+ _("Search for Linux partitions")
+ ],
+ [
+ // TRANSLATORS: progress step
+ _("Evaluating update..."),
+ // TRANSLATORS: progress step
+ _("Searching for Linux partitions...")
+ ],
+ // TRANSLATORS: dialog help
+ _("Please wait while installed systems are being probed...")
+);
+Wizard::SetTitleIcon ("yast-software");
+
+Progress::NextStage ();
+y2milestone ("Step: Evaluate update");
+
boolean offer_update = false;
y2milestone ("Product flags: %1", Product::flags);
- if (contains (Product::flags, "update") || Kernel::GetSuSEUpdate ())
- {
+ if (contains (Product::flags, "update") || Kernel::GetSuSEUpdate ()) {
offer_update = true;
}
-// FIXME copy-paste from inst_mode
+Progress::NextStage ();
+y2milestone ("Step: Has Linux partitions");
+
boolean have_linux = false;
- if (Storage::HaveLinuxPartitions ())
- {
+ if (Storage::HaveLinuxPartitions ()) {
have_linux = true;
}
y2milestone ("Have Linux: %1, Offer Update: %2", have_linux, offer_update);
+Progress::Finish ();
+
boolean other_options_disabled = false;
if (! (have_linux && offer_update))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.16/VERSION new/yast2-installation-2.15.17/VERSION
--- old/yast2-installation-2.15.16/VERSION 2007-03-28 16:20:24.000000000 +0200
+++ new/yast2-installation-2.15.17/VERSION 2007-04-05 17:31:56.000000000 +0200
@@ -1 +1 @@
-2.15.16
+2.15.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org