Hello community,
here is the log from the commit of package yast2-add-on
checked in at Tue Apr 3 19:55:10 CEST 2007.
--------
--- yast2-add-on/yast2-add-on.changes 2007-03-28 16:14:02.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-add-on/yast2-add-on.changes 2007-03-30 14:00:24.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Mar 30 13:44:18 CEST 2007 - locilka@suse.cz
+
+- Reporting Low-Memory issue during installation on machines with
+ less than 384 MB (-5%) of total memory (together with available
+ swap). User is warned not to use Add-Ons in such case (bugzilla
+ #239630).
+- Skipping the first table listing Add-Ons if no Add-Ons are in
+ use. The first dialog is then Selecting the Add-On (FATE
+ #301928).
+- Adjusted RPM dependencies
+- 2.15.6
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-2.15.5.tar.bz2
New:
----
yast2-add-on-2.15.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.d11103/_old 2007-04-03 19:51:35.000000000 +0200
+++ /var/tmp/diff_new_pack.d11103/_new 2007-04-03 19:51:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on (Version 2.15.5)
+# spec file for package yast2-add-on (Version 2.15.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,20 +11,20 @@
# norootforbuild
Name: yast2-add-on
-Version: 2.15.5
+Version: 2.15.6
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-2.15.5.tar.bz2
+Source0: yast2-add-on-2.15.6.tar.bz2
prefix: /usr
Requires: autoyast2-installation
# WorkflowManager module
Requires: yast2 >= 2.15.22
Requires: yast2-installation
Requires: yast2-country
-# AddOnProduct::RedrawWizardSteps (global)
-Requires: yast2-packager >= 2.15.23
+# AddOnProduct::low_memory_already_reported
+Requires: yast2-packager >= 2.15.27
Requires: yast2-storage
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-installation yast2-packager yast2-storage yast2-testsuite
BuildRequires: yast2 >= 2.15.22
@@ -47,7 +47,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-add-on-2.15.5
+%setup -n yast2-add-on-2.15.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +86,16 @@
%doc %{prefix}/share/doc/packages/yast2-add-on
%changelog
+* Fri Mar 30 2007 - locilka@suse.cz
+- Reporting Low-Memory issue during installation on machines with
+ less than 384 MB (-5%%) of total memory (together with available
+ swap). User is warned not to use Add-Ons in such case (bugzilla
+ [#239630]).
+- Skipping the first table listing Add-Ons if no Add-Ons are in
+ use. The first dialog is then Selecting the Add-On (FATE
+ [#301928]).
+- Adjusted RPM dependencies
+- 2.15.6
* Wed Mar 28 2007 - locilka@suse.cz
- Adjusted to use WorkflowManager instead of AddOnProduct module
in some cases (for FATE #129).
++++++ yast2-add-on-2.15.5.tar.bz2 -> yast2-add-on-2.15.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.5/configure new/yast2-add-on-2.15.6/configure
--- old/yast2-add-on-2.15.5/configure 2007-03-05 17:45:46.000000000 +0100
+++ new/yast2-add-on-2.15.6/configure 2007-04-02 14:56:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-add-on 2.15.3.
+# Generated by GNU Autoconf 2.60 for yast2-add-on 2.15.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-add-on'
PACKAGE_TARNAME='yast2-add-on'
-PACKAGE_VERSION='2.15.3'
-PACKAGE_STRING='yast2-add-on 2.15.3'
+PACKAGE_VERSION='2.15.6'
+PACKAGE_STRING='yast2-add-on 2.15.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-add-on 2.15.3 to adapt to many kinds of systems.
+\`configure' configures yast2-add-on 2.15.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-add-on 2.15.3:";;
+ short | recursive ) echo "Configuration of yast2-add-on 2.15.6:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-add-on configure 2.15.3
+yast2-add-on configure 2.15.6
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-add-on $as_me 2.15.3, which was
+It was created by yast2-add-on $as_me 2.15.6, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-add-on'
- VERSION='2.15.3'
+ VERSION='2.15.6'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.3"
+VERSION="2.15.6"
RPMNAME="yast2-add-on"
MAINTAINER="Lukas Ocilka "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-add-on $as_me 2.15.3, which was
+This file was extended by yast2-add-on $as_me 2.15.6, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-add-on config.status 2.15.3
+yast2-add-on config.status 2.15.6
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.5/configure.in new/yast2-add-on-2.15.6/configure.in
--- old/yast2-add-on-2.15.5/configure.in 2007-03-05 17:45:42.000000000 +0100
+++ new/yast2-add-on-2.15.6/configure.in 2007-04-02 14:56:16.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-add-on, 2.15.3, http://bugs.opensuse.org/, yast2-add-on)
+AC_INIT(yast2-add-on, 2.15.6, http://bugs.opensuse.org/, yast2-add-on)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.3"
+VERSION="2.15.6"
RPMNAME="yast2-add-on"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.5/src/add-on-workflow.ycp new/yast2-add-on-2.15.6/src/add-on-workflow.ycp
--- old/yast2-add-on-2.15.5/src/add-on-workflow.ycp 2007-03-28 09:03:39.000000000 +0200
+++ new/yast2-add-on-2.15.6/src/add-on-workflow.ycp 2007-03-30 13:52:17.000000000 +0200
@@ -896,6 +896,68 @@
}
}
+/**
+ * Returns whether the machine has insufficient memory for using
+ * Add-Ons (in inst-sys).
+ *
+ * @return boolean has insufficient memory
+ */
+boolean HasInsufficientMemory () {
+ // 384 MB - 5% (bugzilla #239630)
+ integer enough_memory = 373000;
+
+ map meminfo = (map) SCR::Read (.proc.meminfo);
+ integer totalmem = meminfo["memtotal"]:0 + meminfo["swaptotal"]:0;
+
+ y2milestone ("Memory: %1, Swap: %2, Total: %3",
+ meminfo["memtotal"]:0, meminfo["swaptotal"]:0, totalmem
+ );
+
+ // something is wrong
+ if (totalmem == nil) {
+ // using only RAM if possible
+ if (meminfo["memtotal"]:nil != nil) {
+ totalmem = meminfo["memtotal"]:0;
+ // can't do anything, just assume we enough
+ } else {
+ totalmem = enough_memory;
+ }
+ }
+
+ // do we have less memory than needed?
+ return (totalmem < enough_memory);
+}
+
+boolean ContinueIfInsufficientMemory () {
+ y2warning ("Not enough memory!");
+
+ // If already reported, just continue
+ if (! AddOnProduct::low_memory_already_reported) {
+ // report it only once
+ AddOnProduct::low_memory_already_reported = true;
+
+ if (Popup::YesNoHeadline (
+ // TRANSLATORS: pop-up headline
+ _("Warning: Not enough memory!"),
+ // TRANSLATORS: pop-up question
+ _("Your system needn't have enough memory to use Add-On products
+in installation. Add-On products can be added later on a running system.
+
+Do you want to skip using Add-On products?")
+ )) {
+ y2milestone ("User decided to skip Add-Ons");
+
+ return false;
+ } else {
+ y2warning ("User decided to continue with not enough memory...!");
+
+ return true;
+ }
+ }
+
+ return true;
+}
+
// bugzilla #221377
// the original control file is stored as /control.xml
// the other (added) control files are under the
@@ -907,17 +969,42 @@
// in the installation proposal - cancel / accept buttons
//
symbol RunAddOnMainDialog (boolean enable_back, boolean enable_next, string back_button, string next_button) {
- Redraw (enable_back, enable_next, back_button, next_button);
symbol ret = nil;
- // added / removed
- boolean some_addon_changed = false;
+ boolean not_enough_memory = (Stage::initial() && HasInsufficientMemory());
+ boolean no_addons = (size (AddOnProduct::add_on_products) == 0);
+
+ // FATE #301928 - Saving one click
+ if (no_addons) {
+ ret = `first_time;
+ }
+
+ // Show Add-Ons table
+ if (not_enough_memory || ! no_addons) {
+ Redraw (enable_back, enable_next, back_button, next_button);
+ }
// store the initial settings, only once
WorkflowManager::SetBaseWorkflow (false);
+ // bugzilla #239630
+ // It might be dangerous to add more installation sources in installation
+ // on machine with less memory
+ // Do not report when some add-ons are already in use
+ if (not_enough_memory && no_addons) {
+ if (! ContinueIfInsufficientMemory ()) return `next;
+ }
+
+ // added / removed
+ boolean some_addon_changed = false;
+
repeat {
- ret = (symbol) Wizard::UserInput();
+ // FATE #301928 - Saving one click
+ if (ret == `first_time) {
+ ret = `add;
+ } else {
+ ret = (symbol) Wizard::UserInput();
+ }
// aborting
if (ret == `abort || ret == `cancel) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.5/VERSION new/yast2-add-on-2.15.6/VERSION
--- old/yast2-add-on-2.15.5/VERSION 2007-03-28 16:07:53.000000000 +0200
+++ new/yast2-add-on-2.15.6/VERSION 2007-03-30 13:54:57.000000000 +0200
@@ -1 +1 @@
-2.15.5
+2.15.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org