Hello community,
here is the log from the commit of package yast2
checked in at Tue Sep 2 18:23:14 CEST 2008.
--------
--- yast2/yast2.changes 2008-08-28 13:40:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-09-02 11:27:03.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Sep 2 11:18:36 CEST 2008 - locilka@suse.cz
+
+- Extended control file handling to accept 'execute' module
+ parameter to be called instead of 'name'/inst_'name'
+ (BNC #401319).
+- 2.17.16
+
+-------------------------------------------------------------------
Old:
----
yast2-2.17.15.tar.bz2
New:
----
yast2-2.17.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.t23009/_old 2008-09-02 18:23:02.000000000 +0200
+++ /var/tmp/diff_new_pack.t23009/_new 2008-09-02 18:23:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.17.15)
+# spec file for package yast2 (Version 2.17.16)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2
-Version: 2.17.15
+Version: 2.17.16
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.15.tar.bz2
+Source0: yast2-2.17.16.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -149,7 +149,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.17.15
+%setup -n yast2-2.17.16
%build
%{prefix}/bin/y2tool y2autoconf
@@ -253,6 +253,11 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Tue Sep 02 2008 locilka@suse.cz
+- Extended control file handling to accept 'execute' module
+ parameter to be called instead of 'name'/inst_'name'
+ (BNC #401319).
+- 2.17.16
* Thu Aug 28 2008 locilka@suse.cz
- Adapted Popup, Confirm, CWM, ALog, GPGWidgets, NetworkPopup,
PackageCallbacks, SignatureCheckDialogs, FileChanges, Initrd,
++++++ yast2-2.17.15.tar.bz2 -> yast2-2.17.16.tar.bz2 ++++++
++++ 5462 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.15/configure.in new/yast2-2.17.16/configure.in
--- old/yast2-2.17.15/configure.in 2008-08-28 13:40:25.000000000 +0200
+++ new/yast2-2.17.16/configure.in 2008-09-02 11:27:29.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.17.15, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.17.16, 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.15"
+VERSION="2.17.16"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
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.15/library/control/src/ProductControl.ycp new/yast2-2.17.16/library/control/src/ProductControl.ycp
--- old/yast2-2.17.15/library/control/src/ProductControl.ycp 2008-08-28 11:06:27.000000000 +0200
+++ new/yast2-2.17.16/library/control/src/ProductControl.ycp 2008-09-02 11:20:57.000000000 +0200
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: ProductControl.ycp 48930 2008-07-09 13:26:37Z locilka $
+ * $Id: ProductControl.ycp 50557 2008-09-02 09:20:57Z locilka $
*/
{
textdomain "base";
@@ -312,28 +312,41 @@
return false;
};
-
-string getClientName(string name ) {
+/**
+ * Returns name of the script to call. If 'execute' is defined,
+ * the client name is taken from there. Then, if a custom control
+ * file is defined, client name is defined as 'name'. Then, inst_'name'
+ * or just 'name' is returned if it does not match the 'inst_' regexp.
+ *
+ * @param string name
+ * @param string execute
+ * @see custom_control_file
+ */
+string getClientName (string name, string execute) {
if (Mode::test())
{
return "inst_test_workflow";
}
- // All client start with "inst_".
- string client = "";
- if ( custom_control_file != "")
- {
- return name;
+
+ // BNC #401319
+ // 'execute; is defined and thus returned
+ if (execute != "" && execute != "") {
+ y2milestone ("Step name '%1' executes '%2'", name, execute);
+ return execute;
}
- else
- {
- if (issubstring(name, _client_prefix)) {
+
+ // Defined custom control file
+ if (custom_control_file != "") {
+ return name;
+
+ // All standard clients start with "inst_"
+ } else {
+ if (issubstring (name, _client_prefix)) {
return name;
} else {
- client = _client_prefix + name;
- return client;
+ return _client_prefix + name;
}
-
}
}
@@ -345,7 +358,7 @@
*/
global define term getClientTerm (map step, map def, any former_result)
{
- string client = getClientName(step["name"]:"dummy");
+ string client = getClientName (step["name"]:"dummy", step["execute"]:"");
term result = toterm(client);
map arguments = $[];
@@ -1129,9 +1142,12 @@
{
map step = modules[current_step]:$[];
string step_name = step["name"]:"";
+ // BNC #401319
+ // if "execute" is defined, it's called without modifications
+ string step_execute = step["execute"]:"";
+ string step_id = step["id"]:"";
boolean run_in_update_mode = step["update"]:true; // default is true
boolean retranslate = step["retranslate"]:false;
- string step_id = step["id"]:"";
// Don't mark back button disabled when back button status
// is forced in the control file
@@ -1208,7 +1224,7 @@
y2error("Error writing step identifier");
}
- symbol result = (symbol) WFM::CallFunction (getClientName(step_name), args);
+ symbol result = (symbol) WFM::CallFunction (getClientName (step_name, step_execute), args);
y2milestone ("Calling %1 returned %2", argterm, result);
// bnc #369846
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.15/library/modules/Version.ycp new/yast2-2.17.16/library/modules/Version.ycp
--- old/yast2-2.17.15/library/modules/Version.ycp 2008-08-28 13:40:34.000000000 +0200
+++ new/yast2-2.17.16/library/modules/Version.ycp 2008-09-02 11:27:38.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.17.15";
+global string yast2 = "2.17.16";
/* 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.15/VERSION new/yast2-2.17.16/VERSION
--- old/yast2-2.17.15/VERSION 2008-08-28 13:39:35.000000000 +0200
+++ new/yast2-2.17.16/VERSION 2008-09-02 11:26:56.000000000 +0200
@@ -1 +1 @@
-2.17.15
+2.17.16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org