Hello community,
here is the log from the commit of package yast2
checked in at Wed Sep 24 17:46:31 CEST 2008.
--------
--- yast2/yast2.changes 2008-09-16 17:31:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-09-23 10:41:12.549759000 +0200
@@ -1,0 +2,45 @@
+Tue Sep 23 10:17:23 CEST 2008 - kmachalkova@suse.cz
+
+- Added Service::Find function - return the first of the list of
+ services which is available (has init script)
+ (needed for bnc#423026)
+- 2.17.28
+
+-------------------------------------------------------------------
+Mon Sep 22 12:58:46 CEST 2008 - visnov@suse.cz
+
+- don't initialize UI in SlideShow.ycp if not necessary (bnc#427345)
+
+-------------------------------------------------------------------
+Thu Sep 18 12:44:25 CEST 2008 - lslezak@suse.cz
+
+- fixed base product detection (use /etc/products.d/baseproduct
+ symlink) (bnc#413444)
+- 2.17.27
+
+-------------------------------------------------------------------
+Wed Sep 17 18:51:08 CEST 2008 - locilka@suse.cz
+
+- Handling new 'add_on_mode' key in product control file
+ (bnc #427002).
+
+-------------------------------------------------------------------
+Wed Sep 17 16:14:08 CEST 2008 - locilka@suse.cz
+
+- Fixed aborting the installation/upgrade (bnc #406401).
+
+-------------------------------------------------------------------
+Wed Sep 17 15:57:00 CEST 2008 - lslezak@suse.cz
+
+- PackageCallbacks.ycp - fixed `ButtonBox definition (bnc#426965)
+
+-------------------------------------------------------------------
+Wed Sep 17 14:07:08 CEST 2008 - lslezak@suse.cz
+
+- Progress.ycp - check whether widget `progress_replace_point
+ exists (bnc#412453)
+- display a link to Yast Bug Reporting Howto page in the "crash"
+ dialog (bnc#421805)
+- 2.17.26
+
+-------------------------------------------------------------------
Old:
----
yast2-2.17.25.tar.bz2
New:
----
yast2-2.17.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.j31358/_old 2008-09-24 17:46:10.000000000 +0200
+++ /var/tmp/diff_new_pack.j31358/_new 2008-09-24 17:46:10.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.17.25)
+# spec file for package yast2 (Version 2.17.28)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2
-Version: 2.17.25
+Version: 2.17.28
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.25.tar.bz2
+Source0: yast2-2.17.28.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -147,7 +147,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.17.25
+%setup -n yast2-2.17.28
%build
%{prefix}/bin/y2tool y2autoconf
@@ -251,6 +251,30 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Tue Sep 23 2008 kmachalkova@suse.cz
+- Added Service::Find function - return the first of the list of
+ services which is available (has init script)
+ (needed for bnc#423026)
+- 2.17.28
+* Mon Sep 22 2008 visnov@suse.cz
+- don't initialize UI in SlideShow.ycp if not necessary (bnc#427345)
+* Thu Sep 18 2008 lslezak@suse.cz
+- fixed base product detection (use /etc/products.d/baseproduct
+ symlink) (bnc#413444)
+- 2.17.27
+* Wed Sep 17 2008 locilka@suse.cz
+- Handling new 'add_on_mode' key in product control file
+ (bnc #427002).
+* Wed Sep 17 2008 locilka@suse.cz
+- Fixed aborting the installation/upgrade (bnc #406401).
+* Wed Sep 17 2008 lslezak@suse.cz
+- PackageCallbacks.ycp - fixed `ButtonBox definition (bnc#426965)
+* Wed Sep 17 2008 lslezak@suse.cz
+- Progress.ycp - check whether widget `progress_replace_point
+ exists (bnc#412453)
+- display a link to Yast Bug Reporting Howto page in the "crash"
+ dialog (bnc#421805)
+- 2.17.26
* Tue Sep 16 2008 lslezak@suse.cz
- added Service::EnabledServices() and .sysconfig.cron agent
(access to /etc/sysconfig/cron file) (bnc#425864)
++++++ yast2-2.17.25.tar.bz2 -> yast2-2.17.28.tar.bz2 ++++++
++++ 2350 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-2.17.25/configure.in new/yast2-2.17.28/configure.in
--- old/yast2-2.17.25/configure.in 2008-09-16 17:28:08.000000000 +0200
+++ new/yast2-2.17.28/configure.in 2008-04-17 16:38:45.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.17.25, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.52, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.25"
+VERSION="2.16.52"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -170,21 +170,8 @@
fi
-AC_MSG_CHECKING([for ifcfg location])
-# fallback, default on openSUSE
-IFCFG_DIR=/etc/sysconfig/network
-for TRY in /etc/sysconfig/network-scripts; do
- if test -d $TRY; then
- IFCFG_DIR=$TRY
- break
- fi
-done
-AC_SUBST([IFCFG_DIR])
-AC_MSG_RESULT([$IFCFG_DIR])
-
# also done via makefile
-AC_CONFIG_FILES(library/modules/Version.ycp
-library/network/agents/network.scr)
+AC_CONFIG_FILES(./library/modules/Version.ycp)
AC_CONFIG_FILES(Makefile data/Makefile
doc/autodocs/Makefile
doc/examples/Makefile
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-2.17.25/library/control/src/ProductControl.ycp new/yast2-2.17.28/library/control/src/ProductControl.ycp
--- old/yast2-2.17.25/library/control/src/ProductControl.ycp 2008-09-09 16:38:57.000000000 +0200
+++ new/yast2-2.17.28/library/control/src/ProductControl.ycp 2008-09-19 14:43:07.000000000 +0200
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: ProductControl.ycp 50557 2008-09-02 09:20:57Z locilka $
+ * $Id: ProductControl.ycp 51251 2008-09-17 16:53:15Z locilka $
*/
{
textdomain "base";
@@ -42,6 +42,11 @@
// modules to be offered to clone configuration at the end of installation
global list<string> clone_modules = [];
+// additional workflow parameters
+// workflow doesn't only match mode and stage but also these params
+// bnc #427002
+map _additional_workflow_params = $[];
+
// Location of a custom control file
global string custom_control_file = "";
@@ -281,8 +286,6 @@
}
}
-
-
/**
* Check if valid architecture
* @param map module data
@@ -390,6 +393,54 @@
}
+/**
+ * Checks all params set by SetAdditionalWorkflowParams() whether they match the
+ * workfow got as parameter.
+ *
+ * @param map check_workflow
+ * @see SetAdditionalWorkflowParams()
+ */
+boolean CheckAdditionalParams (map & check_workflow) {
+ if (_additional_workflow_params == nil || _additional_workflow_params == $[]) {
+ return true;
+ }
+
+ boolean ret = true;
+
+ foreach (string key_to_check, any value_to_check, _additional_workflow_params, {
+ // exception
+ // If 'add_on_mode' key is not set in the workflow at all
+ // it is considered to be matching that parameter
+ if (key_to_check == "add_on_mode" && ! haskey (check_workflow, key_to_check)) {
+ y2debug ("No 'add_on_mode' defined, matching %1", value_to_check);
+ } else if (check_workflow[key_to_check]:nil != value_to_check) {
+ ret = false;
+ break;
+ }
+ });
+
+ return ret;
+}
+
+/**
+ * Returns workflow matching the selected stage and mode and additiona parameters
+ * if set by SetAdditionalWorkflowParams()
+ *
+ * @param string stage
+ * @param string mode
+ * @return map workflow
+ */
+map FindMatchingWorkflow (string stage, string mode) {
+ y2debug ("workflows: %1", workflows);
+
+ list<map> tmp = filter(map wf, workflows, ``(
+ Check (wf["stage"]:"", stage) && Check (wf["mode"]:"", mode) && CheckAdditionalParams (wf)
+ ));
+
+ y2debug ("Workflow: %1", tmp[0]:$[]);
+
+ return tmp[0]:$[];
+}
/**
* Get workflow defaults
@@ -399,10 +450,7 @@
*/
global define map getModeDefaults(string stage, string mode)
{
- list<map> tmp = filter(map wf, workflows, ``(
- Check(wf["stage"]:"", stage) && Check(wf["mode"]:"", mode )
- ));
- map workflow = tmp[0]:$[];
+ map workflow = FindMatchingWorkflow (stage, mode);
return workflow["defaults"]:$[];
}
@@ -448,10 +496,7 @@
// Files needed during installation.
list<string> needed_client_files = [];
- list<map> tmp = filter(map wf, workflows, ``(
- Check(wf["stage"]:"", stage) && Check(wf["mode"]:"", mode )
- ));
- map workflow = tmp[0]:$[];
+ map workflow = FindMatchingWorkflow (stage, mode);
list<map> modules = workflow["modules"]:[];
integer id = 1;
@@ -493,14 +538,11 @@
*/
global define map getCompleteWorkflow(string stage, string mode)
{
- list<map> tmp = filter(map wf, workflows, ``(
- Check(wf["stage"]:"", stage) && Check(wf["mode"]:"", mode )
- ));
- map workflow = tmp[0]:$[];
- return workflow;
+ return FindMatchingWorkflow (stage, mode);
}
+
/**
* Get modules of current Workflow
* @param string stage
@@ -508,17 +550,12 @@
* @param boolean all enabled and disabled or enabled only
* @return list<map> modules
*/
-global define list<map> getModules(string stage, string mode, symbol which)
+global define list <map> getModules (string stage, string mode, symbol which)
{
- y2debug("workflows: %1", workflows );
- list<map> tmp = filter(map wf, workflows, ``(
- Check(wf["stage"]:"", stage) && Check(wf["mode"]:"", mode )
- ));
- map workflow = tmp[0]:$[];
+ map workflow = FindMatchingWorkflow (stage, mode);
- y2debug("Workflow: %1", workflow );
list<map> modules = workflow["modules"]:[];
- y2debug("modules: %1", modules );
+ y2debug ("modules: %1", modules );
integer id = 1;
if (which == `enabled)
@@ -581,10 +618,8 @@
*/
global string getWorkflowLabel(string stage, string mode, string wz_td)
{
- list<map> tmp = filter(map wf, workflows, ``(
- Check(wf["stage"]:"", stage) && Check(wf["mode"]:"", mode )
- ));
- map workflow = tmp[0]:$[];
+ map workflow = FindMatchingWorkflow (stage, mode);
+
string label = workflow["label"]:"";
if (label == "")
return "";
@@ -1138,6 +1173,12 @@
}
integer minimum_step = allow_back ? 0 : from;
+
+ if (minimum_step < from) {
+ y2warning ("Minimum step set to: %1 even if running from %2, fixing", minimum_step, from);
+ minimum_step = from;
+ }
+
while ((current_step >= 0) && (current_step < size(modules)))
{
map step = modules[current_step]:$[];
@@ -1149,10 +1190,11 @@
boolean run_in_update_mode = step["update"]:true; // default is true
boolean retranslate = step["retranslate"]:false;
- // Don't mark back button disabled when back button status
- // is forced in the control file
- if (step["enable_back"]:nil == nil) {
- if (current_step <= minimum_step) {
+ // The very first dialog has back button disabled
+ if (current_step <= minimum_step) {
+ // Don't mark back button disabled when back button status
+ // is forced in the control file
+ if (! haskey (step, "enable_back")) {
step["enable_back"] = "no";
y2milestone ("Disabling back: %1 %2 %3", current_step, minimum_step, step["enable_back"]:nil);
}
@@ -1287,15 +1329,21 @@
// %2 - logfile, possibly with errors
// %3 - link to our bugzilla
// %4 - directory where YaST logs are stored
+ // %5 - link to the Yast Bug Reporting HOWTO Web page
"Calling the YaST module %1 has failed.
More information can be found near the end of the '%2' file.
This is worth reporting a bug at %3.
-Please, attach also all YaST logs stored in the '%4' directory.",
+Please, attach also all YaST logs stored in the '%4' directory.
+See %5 for more information about YaST logs.",
symbolof (argterm),
"/var/log/YaST2/y2log",
"http://bugzilla.novell.com/",
- "/var/log/YaST2/"
+ "/var/log/YaST2/",
+ // link to the Yast Bug Reporting HOWTO
+ // for translators: use the localized page for your language if it exists,
+ // check the combo box "In other laguages" on top of the page
+ _("http://en.opensuse.org/Bugs/YaST")
)
);
@@ -1325,12 +1373,9 @@
}
else if (result == `abort)
{
- // FATE #300422
- // handling when user aborts the second stage installation
- // or firstboot (bug #247552)
- if (Stage::cont () || Stage::firstboot()) {
- final_result = result;
- }
+ // handling when user aborts the workflow (FATE #300422, bnc #406401, bnc #247552)
+ final_result = result;
+
break;
}
else if (result == `finish)
@@ -1362,7 +1407,7 @@
{
if (former_result == `next)
{
- // if the first client just returns `auto , the back button
+ // if the first client just returns `auto, the back button
// of the next client must be disabled
if (current_step <= minimum_step && ! allow_back)
minimum_step = minimum_step + 1;
@@ -1451,5 +1496,26 @@
return;
}
+/**
+ * Sets additional params for selecting the workflow
+ *
+ * @param map params
+ * @example SetAdditionalWorkflowParams ($["add_on_mode":"update"]);
+ * @example SetAdditionalWorkflowParams ($["add_on_mode":"installation"]);
+ */
+global define void SetAdditionalWorkflowParams (map params) {
+ y2milestone ("Adjusting new additional workflow params: %1", params);
+
+ _additional_workflow_params = params;
+}
+
+/**
+ * Resets all additional params for selecting the workflow
+ * @see SetAdditionalWorkflowParams()
+ */
+global define void ResetAdditionalWorkflowParams () {
+ _additional_workflow_params = $[];
+}
+
// EOF
}
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-2.17.25/library/cwm/src/Makefile.am new/yast2-2.17.28/library/cwm/src/Makefile.am
--- old/yast2-2.17.25/library/cwm/src/Makefile.am 2008-09-09 16:39:03.000000000 +0200
+++ new/yast2-2.17.28/library/cwm/src/Makefile.am 2008-08-27 17:44:43.000000000 +0200
@@ -9,6 +9,7 @@
CWMTab.ycp \
CWMServiceStart.ycp \
CWMTsigKeys.ycp \
+ #CWMAaProfile.ycp \
WizardHW.ycp
EXTRA_DIST = $(module_DATA)
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-2.17.25/library/cwm/src/WizardHW.ycp new/yast2-2.17.28/library/cwm/src/WizardHW.ycp
--- old/yast2-2.17.25/library/cwm/src/WizardHW.ycp 2008-09-09 16:39:03.000000000 +0200
+++ new/yast2-2.17.28/library/cwm/src/WizardHW.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,533 +0,0 @@
-/**
- * File: modules/WizardHW
- * Package: Base YaST package
- * Summary: Routines for generic hardware summary dialog
- * Authors: Jiri Srain
- *
- * $Id: WizardHW.ycp 31290 2006-06-02 10:54:10Z jsrain $
- *
- */
-
-{
-
-module "WizardHW";
-textdomain "base";
-
-import "CWM";
-import "Label";
-import "Report";
-import "Popup";
-import "Wizard";
-
-
-
-
-
-// local store
-
-/**
- * List of items in the currently displayed dialog
- */
-list