Hello community,
here is the log from the commit of package autoyast2
checked in at Thu Jan 17 22:03:46 CET 2008.
--------
--- autoyast2/autoyast2.changes 2008-01-11 10:51:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2008-01-17 16:21:37.548309000 +0100
@@ -1,0 +2,17 @@
+Thu Jan 17 15:48:52 CET 2008 - ug@suse.de
+
+- ShellEscape Code added
+- 2.16.6
+
+-------------------------------------------------------------------
+Tue Jan 15 17:01:53 CET 2008 - ug@suse.de
+
+- the "path" for an ask-question can be in a list now to
+ change multiple elements in the profile
+
+-------------------------------------------------------------------
+Mon Jan 14 15:06:13 CET 2008 - ug@suse.de
+
+- default for missing fixed
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.16.5.tar.bz2
New:
----
autoyast2-2.16.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
++++ 1938 lines (skipped)
++++ between autoyast2/autoyast2.spec
++++ and /mounts/work_src_done/STABLE/autoyast2/autoyast2.spec
++++++ autoyast2-2.16.5.tar.bz2 -> autoyast2-2.16.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.5/configure new/autoyast2-2.16.6/configure
--- old/autoyast2-2.16.5/configure 2008-01-11 10:44:25.000000000 +0100
+++ new/autoyast2-2.16.6/configure 2008-01-17 16:20:38.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.5.
+# Generated by GNU Autoconf 2.61 for autoyast2 2.16.6.
#
# 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.5'
-PACKAGE_STRING='autoyast2 2.16.5'
+PACKAGE_VERSION='2.16.6'
+PACKAGE_STRING='autoyast2 2.16.6'
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.5 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.16.6 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.5:";;
+ short | recursive ) echo "Configuration of autoyast2 2.16.6:";;
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.5
+autoyast2 configure 2.16.6
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.5, which was
+It was created by autoyast2 $as_me 2.16.6, 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.5'
+ VERSION='2.16.6'
cat >>confdefs.h <<_ACEOF
@@ -2416,7 +2416,7 @@
-VERSION="2.16.5"
+VERSION="2.16.6"
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.5, which was
+This file was extended by autoyast2 $as_me 2.16.6, 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.5
+autoyast2 config.status 2.16.6
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.5/configure.in new/autoyast2-2.16.6/configure.in
--- old/autoyast2-2.16.5/configure.in 2008-01-11 10:44:20.000000000 +0100
+++ new/autoyast2-2.16.6/configure.in 2008-01-17 16:20:33.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.5, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.16.6, 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.5"
+VERSION="2.16.6"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.5/doc/CreateProfileDetails.xml new/autoyast2-2.16.6/doc/CreateProfileDetails.xml
--- old/autoyast2-2.16.5/doc/CreateProfileDetails.xml 2008-01-11 10:41:11.000000000 +0100
+++ new/autoyast2-2.16.6/doc/CreateProfileDetails.xml 2008-01-16 11:50:35.000000000 +0100
@@ -1276,54 +1276,6 @@
</para>
</section>
- <section>
- <title>
- Custom Package Selections
- </title>
- <para>
- In addition to the pre-defined selections, you can create custom selections
- by providing a selection file in the selection
- directory. (<filename>suse/setup/descr</filename>) The selection files have a special format and any
- additional selection file must conform to this format, otherwise
- &yast2; will not be able to read it.
- </para>
- <para>
- As an example for the selection file, take a look at the files
- available in the directory <filename>/suse/setup/descr/</filename> on
- the CD-ROMs.
- </para>
- <para>
- After creating a selection file, you can add it to the configuration
- as described earlier in this section. The selection name, for example
- <emphasis>My.sel</emphasis> has to be added to the index files
- <filename>selections</filename> and <filename>directory.yast</filename>
- to make it visible to the installer.
- </para>
- <para>
- The file <filename>My.sel</filename> should have the following format:
- </para>
- <example>
- <title>
- Customized Package selection
- </title>
- <screen>
- http://www.w3.org/2001/XInclude"/>
- </screen>
- </example>
- <para>To use the above selection, the following should be added in the
- control file:</para>
- <example>
- <title>
- Package selection file
- </title>
- <screen>
- http://www.w3.org/2001/XInclude"/>
- </screen>
- </example>
-
- </section>
<section>
<title>
Installing additional and customized Packages
@@ -2544,7 +2496,7 @@
<entry>optional. The default is "false"</entry>
</row>
<row>
- <entry>path</entry>
+ <entry>path (deprecated since openSUSE 11.0 - use pathlist)</entry>
<entry>The path to the element in the profile. It's a comma seperated list of elements that describes the
path to the element you want to change. For example, the ldap server element can be found in the profile
in the <ldap><ldap_server> section. So if you want to change that value, you have to set the
@@ -2555,6 +2507,12 @@
<entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry>
</row>
<row>
+ <entry>pathlist (available since openSUSE 11.0 and replaces <emphasis>path</emphasis>)</entry>
+ <entry>a list of <emphasis>path</emphasis> elements (see above)
+ <para><screen><pathlist config:type="list"><path>networking,dns,hostname</path><path>...</path></screen></para></entry>
+ <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry>
+ </row>
+ <row>
<entry>file (available since SLES10 SP1 and SL 10.2)</entry>
<entry>you can store the answer to a question in a file, to use it in one of your scripts later.
<para><screen><file>/tmp/answer_hostname</file></screen></para></entry>
@@ -2702,7 +2660,7 @@
<general>
<ask-list config:type="list">
<ask>
- <path>ldap,ldap_server</path>
+ <path>ldap,ldap_server</path> <!-- deprecated since openSUSE 11.0; use pathlist instead -->
<stage>cont</stage>
<help>choose your server depending on your department</help>
<selection config:type="list">
@@ -2718,13 +2676,13 @@
<default>ldap2.mydom.de</default>
</ask>
<ask>
- <path>networking,dns,hostname</path>
+ <path>networking,dns,hostname</path> <!-- deprecated since openSUSE 11.0; use pathlist instead -->
<question>Enter Hostname</question>
<stage>initial</stage>
<default>enter your hostname here</default>
</ask>
<ask>
- <path>partitioning,0,partitions,0,filesystem</path>
+ <path>partitioning,0,partitions,0,filesystem</path> <!-- deprecated since openSUSE 11.0; use pathlist instead -->
<question>Filesystem</question>
<type>symbol</type>
<selection config:type="list">
@@ -2803,7 +2761,7 @@
</script>
<dialog config:type="integer">0</dialog>
<element config:type="integer">0</element>
- <path>networking,dns,hostname</path>
+ <path>networking,dns,hostname</path> <!-- deprecated since openSUSE 11.0; use pathlist instead -->
<question>Enter Hostname</question>
<default>enter your hostname here</default>
</ask>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.5/doc/Installation.xml new/autoyast2-2.16.6/doc/Installation.xml
--- old/autoyast2-2.16.5/doc/Installation.xml 2007-05-21 12:26:33.000000000 +0200
+++ new/autoyast2-2.16.6/doc/Installation.xml 2008-01-14 11:08:36.000000000 +0100
@@ -384,6 +384,10 @@
<entry>autoyast=usb://<path> (since SLES10 SP1)</entry>
<entry>Retrieve the control file from USB devices (autoyast will search on all USB devices it can find)</entry>
</row>
+ <row>
+ <entry>autoyast=relurl://<path> (since openSUSE 11.0)</entry>
+ <entry>Retrieve the control file from the installation source (install=....)</entry>
+ </row>
</tbody>
</tgroup>
</table>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.5/src/dialogs/ask.ycp new/autoyast2-2.16.6/src/dialogs/ask.ycp
--- old/autoyast2-2.16.5/src/dialogs/ask.ycp 2008-01-10 15:41:20.000000000 +0100
+++ new/autoyast2-2.16.6/src/dialogs/ask.ycp 2008-01-15 15:39:42.000000000 +0100
@@ -15,6 +15,19 @@
import "Stage";
import "Popup";
+ define list<any> path2pos( string pa ) {
+ list<any> pos = [];
+ foreach( string p, splitstring( pa, "," ), ``{
+ if( regexpmatch( p, "^[1,2,3,4,5,6,7,8,9,0]+$" ) ) {
+ integer index = tointeger(p);
+ pos = add(pos, index);
+ } else {
+ pos = add(pos, p);
+ }
+ });
+ return pos;
+ }
+
define boolean askDialog() {
boolean mod = false;
@@ -40,12 +53,14 @@
term dialog_term = `VBox();
term help_term = `Empty();
term title_term = `Empty();
+ integer element_cnt = 0;
foreach( map ask, (list<map>)dialogs[dialog_nr]:[], ``{
string pathStr = ask["path"]:"";
string type = ask["type"]:"";
string question = ask["question"]:pathStr;
string frametitle = ask["frametitle"]:"";
- string entry_id = sformat("%1_%2",dialog_nr, ask["element"]:0);
+ string entry_id = sformat("%1_%2",dialog_nr, ask["element"]:element_cnt);
+ element_cnt = element_cnt + 1;
list< map > s = ask["selection"]:[];
helptext = helptext + ask["help"]:"";
title = ask["title"]:"";
@@ -138,11 +153,12 @@
any ret = UI::UserInput();
if( ret == `ok ) {
integer runAgain = 0;
+ integer element_cnt = 0;
foreach( map ask, (list<map>)dialogs[dialog_nr]:[], ``{
- list<string> position = splitstring( ask["path"]:"", "," );
string file = ask["file"]:"";
map script = ask["script"]:$[];
- string entry_id = sformat("%1_%2",dialog_nr, ask["element"]:0);
+ string entry_id = sformat("%1_%2",dialog_nr, ask["element"]:element_cnt);
+ element_cnt = element_cnt + 1;
any val = UI::QueryWidget(`id(entry_id), `Value);
if( ask["type"]:"string" == "integer" ) {
val = tointeger((string)val);
@@ -155,17 +171,15 @@
}
}
y2milestone("question=%1 was answered with val=%2",ask["question"]:"", val);
- list<any> pos = [];
- foreach( string p, position, ``{
- if( regexpmatch( p, "^[1,2,3,4,5,6,7,8,9,0]+$" ) ) {
- integer index = tointeger(p);
- pos = add(pos, index);
- } else {
- pos = add(pos, p);
- }
- });
+ list<any> pos = path2pos( ask["path"]:"" );
if( ask["path"]:"" != "" )
Profile::current = Profile::setElementByList( pos, val, Profile::current );
+
+ foreach( string p, ask["pathlist"]:[], ``{
+ list<any> pos = path2pos( p );
+ Profile::current = Profile::setElementByList( pos, val, Profile::current );
+ });
+
if( file != "" ) {
if( ! SCR::Write (.target.string, file, sformat("%1",val)) )
y2milestone("writing answer to %1 failed",file);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.5/src/include/xml.ycp new/autoyast2-2.16.6/src/include/xml.ycp
--- old/autoyast2-2.16.5/src/include/xml.ycp 2007-05-21 12:26:37.000000000 +0200
+++ new/autoyast2-2.16.6/src/include/xml.ycp 2008-01-15 17:03:53.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: XML handling
* Authors: Anas Nashif
*
- * $Id: xml.ycp 37310 2007-04-04 15:35:03Z ug $
+ * $Id: xml.ycp 43624 2008-01-15 16:03:53Z ug $
*/
{
@@ -92,7 +92,8 @@
"smtp_auth":"smtp_auth_entry",
"patterns":"pattern",
"dont_merge":"element",
- "keys":"keyid"
+ "keys":"keyid",
+ "pathlist":"path"
];
doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config"];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.5/src/modules/AutoinstConfig.ycp new/autoyast2-2.16.6/src/modules/AutoinstConfig.ycp
--- old/autoyast2-2.16.5/src/modules/AutoinstConfig.ycp 2008-01-09 16:38:52.000000000 +0100
+++ new/autoyast2-2.16.6/src/modules/AutoinstConfig.ycp 2008-01-17 15:31:43.000000000 +0100
@@ -290,6 +290,24 @@
}
/**
+ * escape a string so it can be passed to a shell
+ * @return escaped string string
+ */
+ global define string ShellEscape( string s ) ``{
+ integer i = 0;
+ string res = "";
+
+ while( i /tmp/ay_ipipe", val ), $[]);
+ SCR::Execute (.target.bash, sformat("echo \"%1\" > /tmp/ay_ipipe", AutoinstConfig::ShellEscape((string)val) ), $[]);
} else if( widget == "entry" ) {
any val = UI::QueryWidget(`id(`ay_entry), `Value);
- SCR::Execute (.target.bash, sformat("echo \"%1\" > /tmp/ay_ipipe", (string)(val) ), $[]);
+ SCR::Execute (.target.bash, sformat("echo \"%1\" > /tmp/ay_ipipe", AutoinstConfig::ShellEscape((string)(val)) ), $[]);
}
ok_button = false;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.5/src/modules/ProfileLocation.ycp new/autoyast2-2.16.6/src/modules/ProfileLocation.ycp
--- old/autoyast2-2.16.5/src/modules/ProfileLocation.ycp 2007-12-03 14:25:29.000000000 +0100
+++ new/autoyast2-2.16.6/src/modules/ProfileLocation.ycp 2008-01-17 15:42:50.000000000 +0100
@@ -111,7 +111,7 @@
p = (string) UI::QueryWidget(`id(`password), `Value);
} until ( button == `ok );
UI::CloseDialog();
- SCR::Execute( .target.bash, sformat("gpg2 --batch --output \"/tmp/decrypt.xml\" --passphrase \"%1\" %2",p, localfile) );
+ SCR::Execute( .target.bash, sformat("gpg2 --batch --output \"/tmp/decrypt.xml\" --passphrase \"%1\" %2",AutoinstConfig::ShellEscape(p), localfile) );
if( SCR::Read (.target.size, "/tmp/decrypt.xml") > 0 ) {
SCR::Execute( .target.bash, sformat("mv /tmp/decrypt.xml %1",localfile) );
y2milestone("decrypted. Moving now /tmp/decrypt.xml to %1",localfile);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.5/src/schema/general.rnc new/autoyast2-2.16.6/src/schema/general.rnc
--- old/autoyast2-2.16.5/src/schema/general.rnc 2007-11-26 17:58:52.000000000 +0100
+++ new/autoyast2-2.16.6/src/schema/general.rnc 2008-01-17 16:19:08.000000000 +0100
@@ -4,7 +4,7 @@
general = element general { mode? & mouse? & ask-list? & signature-handling? }
ask-list = element ask-list { LIST, ask* }
-ask = element ask { ask_question? & ask_default? & ask_help? & ask_title? & ask_type? & ask_password? & ask_path & ask_stage? & ask_selection? & ask_file? & ask_dialog? & ask_element? & ask_frametitle? & ask_script? }
+ask = element ask { ask_question? & ask_default? & ask_help? & ask_title? & ask_type? & ask_password? & ask_path? & ask_pathlist? & ask_stage? & ask_selection? & ask_file? & ask_dialog? & ask_element? & ask_frametitle? & ask_script? }
ask_question = element question { text }
ask_default = element default { text }
ask_help = element help { text }
@@ -21,6 +21,11 @@
ask_dialog = element dialog { text }
ask_element = element element { text }
ask_frametitle = element frametitle { text }
+ask_pathlist = element pathlist {
+ LIST,
+ ask_path*
+}
+
signature-handling = element signature-handling { accept_unsigned_file? & accept_file_without_checksum? & accept_verification_failed? & accept_unknown_gpg_key? & import_gpg_key? & accept_non_trusted_gpg_key? }
accept_unsigned_file = element accept_unsigned_file { BOOLEAN }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.5/VERSION new/autoyast2-2.16.6/VERSION
--- old/autoyast2-2.16.5/VERSION 2008-01-11 10:42:31.000000000 +0100
+++ new/autoyast2-2.16.6/VERSION 2008-01-17 15:48:48.000000000 +0100
@@ -1 +1 @@
-2.16.5
+2.16.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org