Hello community,
here is the log from the commit of package yast2-add-on
checked in at Thu Sep 6 21:12:01 CEST 2007.
--------
--- yast2-add-on/yast2-add-on.changes 2007-08-29 13:09:20.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-add-on/yast2-add-on.changes 2007-09-05 14:45:18.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Sep 5 14:02:25 CEST 2007 - locilka@suse.cz
+
+- NotEnoughMemory-functions moved to a separate misc.ycp include
+ file to make them possible to be used from packager (#305554).
+- Skipping Add-Ons when requested by user (#305554).
+- Adjusted RPM dependencies.
+- 2.15.15
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-2.15.14.tar.bz2
New:
----
yast2-add-on-2.15.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.p22837/_old 2007-09-06 21:09:15.000000000 +0200
+++ /var/tmp/diff_new_pack.p22837/_new 2007-09-06 21:09:15.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on (Version 2.15.14)
+# spec file for package yast2-add-on (Version 2.15.15)
#
# 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.14
+Version: 2.15.15
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-2.15.14.tar.bz2
+Source0: yast2-add-on-2.15.15.tar.bz2
prefix: /usr
Requires: autoyast2-installation
# WorkflowManager module
Requires: yast2 >= 2.15.22
Requires: yast2-installation
Requires: yast2-country
-# AddOnProduct::low_memory_already_reported
-Requires: yast2-packager >= 2.15.27
+# AddOnProduct::skip_add_ons
+Requires: yast2-packager >= 2.15.75
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.14
+%setup -n yast2-add-on-2.15.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +86,12 @@
%doc %{prefix}/share/doc/packages/yast2-add-on
%changelog
+* Wed Sep 05 2007 - locilka@suse.cz
+- NotEnoughMemory-functions moved to a separate misc.ycp include
+ file to make them possible to be used from packager (#305554).
+- Skipping Add-Ons when requested by user (#305554).
+- Adjusted RPM dependencies.
+- 2.15.15
* Wed Aug 29 2007 - locilka@suse.cz
- Using new Wizard window without installation steps displayed when
adding new Add-On. Dialog help is visible immediately. Restoring
++++++ yast2-add-on-2.15.14.tar.bz2 -> yast2-add-on-2.15.15.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.14/add-on.pot new/yast2-add-on-2.15.15/add-on.pot
--- old/yast2-add-on-2.15.14/add-on.pot 2007-08-29 10:46:48.000000000 +0200
+++ new/yast2-add-on-2.15.15/add-on.pot 2007-09-04 15:57:33.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-29 10:46+0200\n"
+"POT-Creation-Date: 2007-09-04 15:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,62 +17,62 @@
"Content-Transfer-Encoding: 8bit\n"
#. radio button
-#: src/add-on-workflow.ycp:90
+#: src/add-on-workflow.ycp:94
msgid "&Scan Using SLP..."
msgstr ""
#. radio button
-#: src/add-on-workflow.ycp:92
+#: src/add-on-workflow.ycp:96
msgid "&FTP..."
msgstr ""
#. radio button
-#: src/add-on-workflow.ycp:94
+#: src/add-on-workflow.ycp:98
msgid "&HTTP..."
msgstr ""
#. radio button
-#: src/add-on-workflow.ycp:96
+#: src/add-on-workflow.ycp:100
msgid "HTT&PS..."
msgstr ""
#. radio button
-#: src/add-on-workflow.ycp:98
+#: src/add-on-workflow.ycp:102
msgid "&SMB/CIFS"
msgstr ""
#. radio button
-#: src/add-on-workflow.ycp:100
+#: src/add-on-workflow.ycp:104
msgid "&NFS..."
msgstr ""
#. radio button
-#: src/add-on-workflow.ycp:102 src/add-on-workflow.ycp:119
+#: src/add-on-workflow.ycp:106 src/add-on-workflow.ycp:123
msgid "&CD..."
msgstr ""
#. radio button
-#: src/add-on-workflow.ycp:104 src/add-on-workflow.ycp:121
+#: src/add-on-workflow.ycp:108 src/add-on-workflow.ycp:125
msgid "&DVD..."
msgstr ""
#. radio button
-#: src/add-on-workflow.ycp:106 src/add-on-workflow.ycp:123
+#: src/add-on-workflow.ycp:110 src/add-on-workflow.ycp:127
msgid "&Local Directory..."
msgstr ""
#. radio button
-#: src/add-on-workflow.ycp:108 src/add-on-workflow.ycp:125
+#: src/add-on-workflow.ycp:112 src/add-on-workflow.ycp:129
msgid "Specify &URL..."
msgstr ""
#. dialog caption
-#: src/add-on-workflow.ycp:134 src/add-on.ycp:56
+#: src/add-on-workflow.ycp:138 src/add-on.ycp:56
msgid "Add-On Product Media"
msgstr ""
#. help
-#: src/add-on-workflow.ycp:136
+#: src/add-on-workflow.ycp:140
msgid ""
"<p><big><b>Catalog Media</b></big><br>\n"
"Add-on products can be installed from CD, over a\n"
@@ -80,7 +80,7 @@
msgstr ""
#. help, continued
-#: src/add-on-workflow.ycp:142
+#: src/add-on-workflow.ycp:146
msgid ""
"<p>\n"
"To install add-on product from <b>CD</b>,\n"
@@ -88,7 +88,7 @@
msgstr ""
#. help, continued
-#: src/add-on-workflow.ycp:147
+#: src/add-on-workflow.ycp:151
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -99,7 +99,7 @@
msgstr ""
#. help, continued
-#: src/add-on-workflow.ycp:156
+#: src/add-on-workflow.ycp:160
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -116,39 +116,39 @@
#. else
#. {
#. yes-no popup
-#: src/add-on-workflow.ycp:225 src/add-on-workflow.ycp:471
-#: src/add-on-workflow.ycp:760
+#: src/add-on-workflow.ycp:236 src/add-on-workflow.ycp:492
+#: src/add-on-workflow.ycp:781
msgid "Really abort add-on product installation?"
msgstr ""
#. popup error message, %1 is the package name
-#: src/add-on-workflow.ycp:252
+#: src/add-on-workflow.ycp:273
#, ycp-format
msgid ""
"Cannot search for SLP installation sources\n"
"without having %1 package installed"
msgstr ""
-#: src/add-on-workflow.ycp:283
+#: src/add-on-workflow.ycp:304
msgid "Insert the add-on product CD"
msgstr ""
-#: src/add-on-workflow.ycp:284
+#: src/add-on-workflow.ycp:305
msgid "Insert the add-on product DVD"
msgstr ""
#. error report
-#: src/add-on-workflow.ycp:370
+#: src/add-on-workflow.ycp:391
msgid "No catalog found on medium."
msgstr ""
#. busy message
-#: src/add-on-workflow.ycp:387
+#: src/add-on-workflow.ycp:408
msgid "Initializing new source..."
msgstr ""
#. error report
-#: src/add-on-workflow.ycp:415 src/add-on-workflow.ycp:518
+#: src/add-on-workflow.ycp:436 src/add-on-workflow.ycp:539
msgid "Failed to initialize the catalog."
msgstr ""
@@ -158,69 +158,69 @@
#. placeholder for unknown URL
#. placeholder for unknown path
#. summary item, %1 is product name, %2 media URL, %3 directory on media
-#: src/add-on-workflow.ycp:433 src/add-on-workflow.ycp:438
-#: src/add-on-workflow.ycp:932 src/add-on-workflow.ycp:938
+#: src/add-on-workflow.ycp:454 src/add-on-workflow.ycp:459
+#: src/add-on-workflow.ycp:953 src/add-on-workflow.ycp:959
#: src/add-on_proposal.ycp:32 src/add-on_proposal.ycp:36
msgid "Unknown"
msgstr ""
#. table cell, %1 is URL, %2 is directory name
-#: src/add-on-workflow.ycp:436 src/add-on-workflow.ycp:936
+#: src/add-on-workflow.ycp:457 src/add-on-workflow.ycp:957
#, ycp-format
msgid "URL: %1, Directory: %2"
msgstr ""
#. dialog caption
-#: src/add-on-workflow.ycp:442
+#: src/add-on-workflow.ycp:463
msgid "Catalog Selection"
msgstr ""
#. help text
-#: src/add-on-workflow.ycp:444
+#: src/add-on-workflow.ycp:465
msgid ""
"<p><big><b>Catalog Selection</b></big><br>\n"
"There were multiple catalogs found on the selected medium.\n"
"Select the catalog to use.</p>\n"
msgstr ""
-#: src/add-on-workflow.ycp:451
+#: src/add-on-workflow.ycp:472
msgid "&Found Catalogs"
msgstr ""
#. popup message
-#: src/add-on-workflow.ycp:487
+#: src/add-on-workflow.ycp:508
msgid "Select a catalog."
msgstr ""
#. table cell
-#: src/add-on-workflow.ycp:588
+#: src/add-on-workflow.ycp:609
msgid "No product found in the catalog"
msgstr ""
#. error pop-up
-#: src/add-on-workflow.ycp:658 src/add-on-workflow.ycp:815
+#: src/add-on-workflow.ycp:679 src/add-on-workflow.ycp:836
msgid ""
"The product on the media is already installed\n"
"or selected for installation."
msgstr ""
#. message popup
-#: src/add-on-workflow.ycp:676
+#: src/add-on-workflow.ycp:697
msgid "Dependencies of the add-on product cannot be fulfilled."
msgstr ""
#. dialog caption
-#: src/add-on-workflow.ycp:733
+#: src/add-on-workflow.ycp:754
msgid "Product Selection"
msgstr ""
#. multi selection list
-#: src/add-on-workflow.ycp:737
+#: src/add-on-workflow.ycp:758
msgid "Available Products"
msgstr ""
#. help text
-#: src/add-on-workflow.ycp:741
+#: src/add-on-workflow.ycp:762
msgid ""
"<p><b><big>Product Selection</big></b><br>\n"
"There were multiple products found in the catalog. Select the products\n"
@@ -228,20 +228,20 @@
msgstr ""
#. message popup
-#: src/add-on-workflow.ycp:802
+#: src/add-on-workflow.ycp:823
msgid "Dependencies of the selected add-on products cannot be fulfilled."
msgstr ""
#. main screen heading
#. feedback heading
#. TRANSLATORS: dialog caption
-#: src/add-on-workflow.ycp:919 src/add-on.ycp:114
+#: src/add-on-workflow.ycp:940 src/add-on.ycp:114
#: src/inst_language_add-on.ycp:114 src/inst_language_add-on.ycp:163
msgid "Add-On Product Installation"
msgstr ""
#. Help for add-on products
-#: src/add-on-workflow.ycp:922
+#: src/add-on-workflow.ycp:943
msgid ""
"<p><big><b>Add-On Product Installation</b></big></br>\n"
"Here see all add-on products that are selected for installation.\n"
@@ -250,22 +250,22 @@
msgstr ""
#. table header
-#: src/add-on-workflow.ycp:948
+#: src/add-on-workflow.ycp:969
msgid "Media"
msgstr ""
#. table header
-#: src/add-on-workflow.ycp:950
+#: src/add-on-workflow.ycp:971
msgid "Product"
msgstr ""
#. TRANSLATORS: pop-up headline
-#: src/add-on-workflow.ycp:1022
+#: src/add-on-workflow.ycp:1043
msgid "Warning: Not enough memory!"
msgstr ""
#. TRANSLATORS: pop-up question
-#: src/add-on-workflow.ycp:1024
+#: src/add-on-workflow.ycp:1045
msgid ""
"Your system does not seem to have enough memory to use add-on products\n"
"during installation. You can enable add-on products later when the\n"
@@ -275,7 +275,7 @@
msgstr ""
#. message report
-#: src/add-on-workflow.ycp:1103
+#: src/add-on-workflow.ycp:1124
msgid "Select a product to delete."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.14/src/add-on-workflow.ycp new/yast2-add-on-2.15.15/src/add-on-workflow.ycp
--- old/yast2-add-on-2.15.14/src/add-on-workflow.ycp 2007-08-29 13:08:30.000000000 +0200
+++ new/yast2-add-on-2.15.15/src/add-on-workflow.ycp 2007-09-04 16:49:26.000000000 +0200
@@ -31,8 +31,10 @@
import "Wizard";
import "Confirm";
import "GetInstArgs";
+import "Installation";
include "packager/inst_source_dialogs.ycp";
+include "add-on/misc.ycp";
boolean going_back_in_workflow = GetInstArgs::going_back();
@@ -998,69 +1000,6 @@
}
}
-/**
- * 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 does not seem to have enough memory to use add-on products
-during installation. You can enable add-on products later when the
-system is running.
-
-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
@@ -1082,7 +1021,13 @@
// 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;
+ if (! ContinueIfInsufficientMemory ()) {
+ // next time, it will be skipped too
+ Installation::add_on_selected = false;
+ Installation::productsources_selected = false;
+
+ return `next;
+ }
}
// FATE #301928 - Saving one click
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.14/src/inst_add-on.ycp new/yast2-add-on-2.15.15/src/inst_add-on.ycp
--- old/yast2-add-on-2.15.14/src/inst_add-on.ycp 2007-05-18 10:44:13.000000000 +0200
+++ new/yast2-add-on-2.15.15/src/inst_add-on.ycp 2007-09-05 14:44:07.000000000 +0200
@@ -21,6 +21,11 @@
include "add-on/add-on-workflow.ycp";
+if (AddOnProduct::skip_add_ons) {
+ y2milestone ("Skipping add-ons (as requested before)");
+ return `auto;
+}
+
map argmap = GetInstArgs::argmap();
Packages::SelectProduct ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.14/src/Makefile.am new/yast2-add-on-2.15.15/src/Makefile.am
--- old/yast2-add-on-2.15.14/src/Makefile.am 2007-05-18 10:44:13.000000000 +0200
+++ new/yast2-add-on-2.15.15/src/Makefile.am 2007-09-04 16:14:19.000000000 +0200
@@ -11,7 +11,8 @@
vendor.ycp
ynclude_DATA = \
- add-on-workflow.ycp
+ add-on-workflow.ycp \
+ misc.ycp
desktop_DATA = \
add-on.desktop \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.14/src/Makefile.in new/yast2-add-on-2.15.15/src/Makefile.in
--- old/yast2-add-on-2.15.14/src/Makefile.in 2007-08-29 13:18:33.000000000 +0200
+++ new/yast2-add-on-2.15.15/src/Makefile.in 2007-09-04 16:22:27.000000000 +0200
@@ -189,7 +189,8 @@
vendor.ycp
ynclude_DATA = \
- add-on-workflow.ycp
+ add-on-workflow.ycp \
+ misc.ycp
desktop_DATA = \
add-on.desktop \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.14/src/misc.ycp new/yast2-add-on-2.15.15/src/misc.ycp
--- old/yast2-add-on-2.15.14/src/misc.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-add-on-2.15.15/src/misc.ycp 2007-09-05 14:34:47.000000000 +0200
@@ -0,0 +1,87 @@
+/**
+ * File:
+ * include/add-on/misc.ycp
+ *
+ * Module:
+ * System installation
+ *
+ * Summary:
+ * Add-on product miscellaneous
+ *
+ * Authors:
+ * Lukas Ocilka
+ *
+ *
+ */
+{
+
+textdomain "add-on";
+
+import "AddOnProduct";
+import "Popup";
+
+/**
+ * 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 does not seem to have enough memory to use add-on products
+during installation. You can enable add-on products later when the
+system is running.
+
+Do you want to skip using add-on products?")
+ )) {
+ y2milestone ("User decided to skip Add-Ons");
+ AddOnProduct::skip_add_ons = true;
+
+ return false;
+ } else {
+ y2warning ("User decided to continue with not enough memory...!");
+
+ return true;
+ }
+ }
+
+ return true;
+}
+
+} //end of include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.15.14/VERSION new/yast2-add-on-2.15.15/VERSION
--- old/yast2-add-on-2.15.14/VERSION 2007-08-29 10:23:52.000000000 +0200
+++ new/yast2-add-on-2.15.15/VERSION 2007-09-05 14:02:07.000000000 +0200
@@ -1 +1 @@
-2.15.14
+2.15.15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org