Hello community,
here is the log from the commit of package autoyast2
checked in at Sat Jan 12 02:32:10 CET 2008.
--------
--- autoyast2/autoyast2.changes 2008-01-08 14:47:59.000000000 +0100
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2008-01-11 10:51:15.795458000 +0100
@@ -1,0 +2,17 @@
+Fri Jan 11 10:42:42 CET 2008 - ug@suse.de
+
+- Documentation update
+- 2.16.5
+
+-------------------------------------------------------------------
+Thu Jan 10 14:53:24 CET 2008 - ug@suse.de
+
+- rerun_on_error added to scripts execution to keep <ask> dialogs
+ open until the answers passes the parsing of a script
+
+-------------------------------------------------------------------
+Wed Jan 9 16:41:29 CET 2008 - ug@suse.de
+
+- added command line option to jump into a module (fate #5997)
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.16.4.tar.bz2
New:
----
autoyast2-2.16.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.ZK1396/_old 2008-01-12 02:31:35.000000000 +0100
+++ /var/tmp/diff_new_pack.ZK1396/_new 2008-01-12 02:31:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package autoyast2 (Version 2.16.4)
+# spec file for package autoyast2 (Version 2.16.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: autoyast2
Url: http://www.suse.de/~ug
-Version: 2.16.4
+Version: 2.16.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.16.4.tar.bz2
+Source0: autoyast2-2.16.5.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-country yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
BuildRequires: yast2 >= 2.16.8
@@ -50,7 +50,7 @@
Anas Nashif
%package installation
-Version: 2.16.4
+Version: 2.16.5
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -73,7 +73,7 @@
Anas Nashif
%prep
-%setup -n autoyast2-2.16.4
+%setup -n autoyast2-2.16.5
%build
%{prefix}/bin/y2tool y2autoconf
@@ -213,6 +213,14 @@
%dir /var/lib/autoinstall
%dir /var/lib/autoinstall/autoconf
%changelog
+* Fri Jan 11 2008 - ug@suse.de
+- Documentation update
+- 2.16.5
+* Thu Jan 10 2008 - ug@suse.de
+- rerun_on_error added to scripts execution to keep <ask> dialogs
+ open until the answers passes the parsing of a script
+* Wed Jan 09 2008 - ug@suse.de
+- added command line option to jump into a module (fate #5997)
* Tue Jan 08 2008 - ug@suse.de
- experimental interactive scripts code added
- Buildrequires fixed
++++++ autoyast2-2.16.4.tar.bz2 -> autoyast2-2.16.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.4/configure new/autoyast2-2.16.5/configure
--- old/autoyast2-2.16.4/configure 2008-01-08 14:46:01.000000000 +0100
+++ new/autoyast2-2.16.5/configure 2008-01-11 10:44:25.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for autoyast2 2.16.4.
+# Generated by GNU Autoconf 2.61 for autoyast2 2.16.5.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.16.4'
-PACKAGE_STRING='autoyast2 2.16.4'
+PACKAGE_VERSION='2.16.5'
+PACKAGE_STRING='autoyast2 2.16.5'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1205,7 +1205,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 autoyast2 2.16.4 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.16.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1276,7 +1276,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.16.4:";;
+ short | recursive ) echo "Configuration of autoyast2 2.16.5:";;
esac
cat <<\_ACEOF
@@ -1354,7 +1354,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.16.4
+autoyast2 configure 2.16.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1368,7 +1368,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 2.16.4, which was
+It was created by autoyast2 $as_me 2.16.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2189,7 +2189,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.16.4'
+ VERSION='2.16.5'
cat >>confdefs.h <<_ACEOF
@@ -2416,7 +2416,7 @@
-VERSION="2.16.4"
+VERSION="2.16.5"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
@@ -3429,7 +3429,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by autoyast2 $as_me 2.16.4, which was
+This file was extended by autoyast2 $as_me 2.16.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3472,7 +3472,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-autoyast2 config.status 2.16.4
+autoyast2 config.status 2.16.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.4/configure.in new/autoyast2-2.16.5/configure.in
--- old/autoyast2-2.16.4/configure.in 2008-01-08 14:45:56.000000000 +0100
+++ new/autoyast2-2.16.5/configure.in 2008-01-11 10:44:20.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.16.4, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.16.5, http://bugs.opensuse.org/, autoyast2)
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.16.4"
+VERSION="2.16.5"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.4/doc/CreateProfileDetails.xml new/autoyast2-2.16.5/doc/CreateProfileDetails.xml
--- old/autoyast2-2.16.4/doc/CreateProfileDetails.xml 2007-11-27 11:33:24.000000000 +0100
+++ new/autoyast2-2.16.5/doc/CreateProfileDetails.xml 2008-01-11 10:41:11.000000000 +0100
@@ -2683,6 +2683,12 @@
<para><screen><debug config:type="boolean">true</debug></screen></para></entry>
<entry>optional (default is "false"). This value needs feedback to be turned on too.</entry>
</row>
+ <row>
+ <entry>rerun_on_error (available since openSUSE 11.0)</entry>
+ <entry>a boolean that keeps the dialog open until the script has an exit code of 0 (zero). So you can parse and check the answers the user gave in the script and popup an error with the "feedback" option.
+ <para><screen><rerun_on_error config:type="boolean">true</rerun_on_error></screen></para></entry>
+ <entry>optional (default is "false"). This value should be used together with the feedback option.</entry>
+ </row>
</tbody>
</tgroup>
@@ -2774,6 +2780,35 @@
</script>
</ask>
</screen>
+<para>
+Since openSUSE 11.0 you can verify the answer of a question with a script like this:
+</para>
+<para>
+<screen>
+ <ask>
+ <script>
+ <filename>my.sh</filename>
+ <rerun_on_error config:type="boolean">true</rerun_on_error>
+ <environment config:type="boolean">true</environment>
+ <source><![CDATA[
+if [ "$VAL" = "myhost" ]; then
+ echo "Illegal Hostname!";
+ exit 1;
+fi
+exit 0
+]]>
+ </source>
+ <debug config:type="boolean">false</debug>
+ <feedback config:type="boolean">true</feedback>
+ </script>
+ <dialog config:type="integer">0</dialog>
+ <element config:type="integer">0</element>
+ <path>networking,dns,hostname</path>
+ <question>Enter Hostname</question>
+ <default>enter your hostname here</default>
+ </ask>
+</screen>
+</para>
</para>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.4/src/clients/autoyast.ycp new/autoyast2-2.16.5/src/clients/autoyast.ycp
--- old/autoyast2-2.16.4/src/clients/autoyast.ycp 2007-11-30 12:50:08.000000000 +0100
+++ new/autoyast2-2.16.5/src/clients/autoyast.ycp 2008-01-09 16:38:52.000000000 +0100
@@ -3,7 +3,7 @@
* Summary: Main file for client call
* Authors: Anas Nashif
*
- * $Id: autoyast.ycp 40719 2007-09-03 14:07:25Z ug $
+ * $Id: autoyast.ycp 43502 2008-01-09 15:40:14Z ug $
*/
{
textdomain "autoinst";
@@ -39,7 +39,7 @@
Pkg::CallbackAcceptFileWithoutChecksum("AutoInstall::callbackTrue");
Pkg::CallbackAcceptUnsignedFile("AutoInstall::callbackTrue");
- void openFile( map options ) {
+ define boolean openFile( map options ) {
if( !Profile::ReadXML( options["filename"]:"" ) ) {
Popup::Error(_("Error while parsing the control file.
Check the log files for more details or fix the
@@ -65,6 +65,14 @@
}
});
Popup::ClearFeedback();
+ AutoSequence ();
+ return true;
+ }
+
+ define boolean runModule( map options ) {
+ AutoinstConfig::runModule = options["modname"]:"";
+ AutoSequence ();
+ return true;
}
@@ -73,16 +81,22 @@
"help" : _("autoyast"),
"guihandler" : AutoSequence,
"actions" : $[
- "file" : $[ "handler":openFile, "help":"file operations" ]
+ "file" : $[ "handler":openFile, "help":"file operations" ],
+ "module": $[ "handler":runModule, "help":"module specific operations" ]
],
"options" : $[
"filename": $[
"type":"string",
"help":"filename=XML_PROFILE"
- ]
+ ],
+ "modname": $[
+ "type":"string",
+ "help":"modname=AYAST_MODULE"
+ ]
],
"mappings" : $[
- "file" : ["filename"]
+ "file" : ["filename"],
+ "module" : ["modname"]
]
];
@@ -95,7 +109,9 @@
string exit = "";
list l = [];
- CommandLine::Run(cmdline);
+ any ret = nil;
+ ret = CommandLine::Run(cmdline);
+
AddOnProduct::CleanModeConfigSources();
return `exit;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.4/src/dialogs/ask.ycp new/autoyast2-2.16.5/src/dialogs/ask.ycp
--- old/autoyast2-2.16.4/src/dialogs/ask.ycp 2008-01-02 15:35:21.000000000 +0100
+++ new/autoyast2-2.16.5/src/dialogs/ask.ycp 2008-01-10 15:41:20.000000000 +0100
@@ -137,6 +137,7 @@
while (true) {
any ret = UI::UserInput();
if( ret == `ok ) {
+ integer runAgain = 0;
foreach( map ask, (list<map>)dialogs[dialog_nr]:[], ``{
list<string> position = splitstring( ask["path"]:"", "," );
string file = ask["file"]:"";
@@ -185,7 +186,9 @@
else
executionString = sformat("/bin/sh %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName );
y2milestone("Script Execution command: %1", executionString );
- SCR::Execute (.target.bash, executionString);
+ runAgain = runAgain + (integer)SCR::Execute (.target.bash, executionString);
+ if( script["rerun_on_error"]:false == false )
+ runAgain = 0;
boolean showFeedback = script["feedback"]:false;
string feedback = "";
if( showFeedback ) {
@@ -196,7 +199,8 @@
}
};
});
- break;
+ if( runAgain == 0 )
+ break;
}
}
UI::CloseDialog();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.4/src/include/conftree.ycp new/autoyast2-2.16.5/src/include/conftree.ycp
--- old/autoyast2-2.16.4/src/include/conftree.ycp 2007-12-04 11:41:29.000000000 +0100
+++ new/autoyast2-2.16.5/src/include/conftree.ycp 2008-01-09 16:38:52.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif
*
- * $Id: conftree.ycp 42647 2007-12-04 10:42:12Z ug $
+ * $Id: conftree.ycp 43502 2008-01-09 15:40:14Z ug $
*/
{
@@ -343,8 +343,14 @@
while(true)
{
- map event = UI::WaitForEvent();
- ret = event["ID"]:nil;
+ if( AutoinstConfig::runModule != "" ) {
+ ret = `configure;
+ Wizard::SelectTreeItem( "module@"+AutoinstConfig::runModule );
+ } else {
+ map event = UI::WaitForEvent();
+ ret = event["ID"]:nil;
+ AutoinstConfig::runModule = "";
+ }
if (ret == `wizardTree)
{
ret = UI::QueryWidget(`id(`wizardTree), `CurrentItem);
@@ -356,6 +362,7 @@
if (ret == `configure)
{
tree_item = Wizard::QueryTreeItem();
+ y2milestone("tree item: %1", tree_item);
y2debug("tree item: %1", tree_item);
string modulename=moduleName(tree_item);
y2debug("configure module: %1", modulename);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.4/src/modules/AutoinstConfig.ycp new/autoyast2-2.16.5/src/modules/AutoinstConfig.ycp
--- old/autoyast2-2.16.4/src/modules/AutoinstConfig.ycp 2007-12-04 11:41:29.000000000 +0100
+++ new/autoyast2-2.16.5/src/modules/AutoinstConfig.ycp 2008-01-09 16:38:52.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: This module handles the configuration for auto-installation
* Authors: Anas Nashif
*
- * $Id: AutoinstConfig.ycp 42647 2007-12-04 10:42:12Z ug $
+ * $Id: AutoinstConfig.ycp 43502 2008-01-09 15:40:14Z ug $
*/
{
module "AutoinstConfig";
@@ -19,7 +19,7 @@
-
+ global string runModule = "";
// Profile Repository
global string Repository = "";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.4/src/modules/AutoinstScripts.ycp new/autoyast2-2.16.5/src/modules/AutoinstScripts.ycp
--- old/autoyast2-2.16.4/src/modules/AutoinstScripts.ycp 2008-01-08 13:51:24.000000000 +0100
+++ new/autoyast2-2.16.5/src/modules/AutoinstScripts.ycp 2008-01-09 11:55:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Custom scripts
* Authors: Anas Nashif
*
- * $Id: AutoinstScripts.ycp 43322 2008-01-08 12:52:45Z ug $
+ * $Id: AutoinstScripts.ycp 43486 2008-01-09 10:56:49Z ug $
*/
{
@@ -693,19 +693,27 @@
{
string debug = ( s["debug"]:true ? "-w" : "" );
if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) {
- executionString = sformat("/usr/bin/perl %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName);
- y2milestone("Script Execution command: %1", executionString );
- SCR::Execute (.target.bash, executionString);
- SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]);
+ if( s["interactive"]:false == true ) {
+ interactiveScript( "/usr/bin/perl", debug, scriptPath, current_logdir, scriptName );
+ } else {
+ executionString = sformat("/usr/bin/perl %1 %2 2&> %3/%4.log ", debug, scriptPath, current_logdir, scriptName);
+ y2milestone("Script Execution command: %1", executionString );
+ SCR::Execute (.target.bash, executionString);
+ SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]);
+ }
}
}
else if (scriptInterpreter == "python")
{
if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) {
- executionString = sformat("/usr/bin/python %1 2&> %2/%3.log ", scriptPath, current_logdir, scriptName );
- y2milestone("Script Execution command: %1", executionString );
- SCR::Execute (.target.bash, executionString);
- SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]);
+ if( s["interactive"]:false == true ) {
+ interactiveScript( "/usr/bin/python", "", scriptPath, current_logdir, scriptName );
+ } else {
+ executionString = sformat("/usr/bin/python %1 2&> %2/%3.log ", scriptPath, current_logdir, scriptName );
+ y2milestone("Script Execution command: %1", executionString );
+ SCR::Execute (.target.bash, executionString);
+ SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]);
+ }
}
}
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.4/VERSION new/autoyast2-2.16.5/VERSION
--- old/autoyast2-2.16.4/VERSION 2008-01-08 14:29:15.000000000 +0100
+++ new/autoyast2-2.16.5/VERSION 2008-01-11 10:42:31.000000000 +0100
@@ -1 +1 @@
-2.16.4
+2.16.5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org