Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at Fri Mar 26 16:37:46 CET 2010. -------- --- autoyast2/autoyast2.changes 2010-03-18 10:34:07.000000000 +0100 +++ autoyast2/autoyast2.changes 2010-03-26 14:10:58.000000000 +0100 @@ -1,0 +2,23 @@ +Fri Mar 26 10:43:46 CET 2010 - ug@suse.de + +- <notification> added to scripts UI +- 2.19.5 + +------------------------------------------------------------------- +Fri Mar 26 09:57:13 CET 2010 - ug@suse.de + +- fixed a race when final_halt or final_reboot was used + (bnc#591300) + +------------------------------------------------------------------- +Thu Mar 25 13:45:53 CET 2010 - ug@suse.de + +- "notification" option added to scripts + +------------------------------------------------------------------- +Thu Mar 18 12:17:36 CET 2010 - ug@suse.de + +- prefer the filename of a remote script instead of the + type of a script when no filename is specified in the XML + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- autoyast2-2.19.4.tar.bz2 New: ---- autoyast2-2.19.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.l1rRjc/_old 2010-03-26 16:36:45.000000000 +0100 +++ /var/tmp/diff_new_pack.l1rRjc/_new 2010-03-26 16:36:45.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.19.4) +# spec file for package autoyast2 (Version 2.19.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: autoyast2 -Version: 2.19.4 +Version: 2.19.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.19.4.tar.bz2 +Source0: autoyast2-2.19.5.tar.bz2 Prefix: /usr @@ -65,7 +65,7 @@ %package installation License: GPLv2+ -Version: 2.19.4 +Version: 2.19.5 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -82,7 +82,7 @@ generated with the autoyast2 package. %prep -%setup -n autoyast2-2.19.4 +%setup -n autoyast2-2.19.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ autoyast2-2.19.4.tar.bz2 -> autoyast2-2.19.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.4/VERSION new/autoyast2-2.19.5/VERSION --- old/autoyast2-2.19.4/VERSION 2010-03-18 10:31:10.000000000 +0100 +++ new/autoyast2-2.19.5/VERSION 2010-03-26 14:09:00.000000000 +0100 @@ -1 +1 @@ -2.19.4 +2.19.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.4/configure new/autoyast2-2.19.5/configure --- old/autoyast2-2.19.4/configure 2010-03-18 10:32:29.000000000 +0100 +++ new/autoyast2-2.19.5/configure 2010-03-26 14:09:22.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for autoyast2 2.19.4. +# Generated by GNU Autoconf 2.63 for autoyast2 2.19.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.19.4' -PACKAGE_STRING='autoyast2 2.19.4' +PACKAGE_VERSION='2.19.5' +PACKAGE_STRING='autoyast2 2.19.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1282,7 +1282,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.19.4 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.19.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1353,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.19.4:";; + short | recursive ) echo "Configuration of autoyast2 2.19.5:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.19.4 +autoyast2 configure 2.19.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1447,7 +1447,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.19.4, which was +It was created by autoyast2 $as_me 2.19.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2427,7 +2427,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.19.4' + VERSION='2.19.5' cat >>confdefs.h <<_ACEOF @@ -2549,7 +2549,7 @@ -VERSION="2.19.4" +VERSION="2.19.5" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" @@ -3609,7 +3609,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.19.4, which was +This file was extended by autoyast2 $as_me 2.19.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3659,7 +3659,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -autoyast2 config.status 2.19.4 +autoyast2 config.status 2.19.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.4/configure.in new/autoyast2-2.19.5/configure.in --- old/autoyast2-2.19.4/configure.in 2010-03-18 10:32:26.000000000 +0100 +++ new/autoyast2-2.19.5/configure.in 2010-03-26 14:09:18.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.19.4, http://bugs.opensuse.org/, autoyast2) +AC_INIT(autoyast2, 2.19.5, http://bugs.opensuse.org/, autoyast2) 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.19.4" +VERSION="2.19.5" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug@suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.4/doc/RulesAndClasses.xml new/autoyast2-2.19.5/doc/RulesAndClasses.xml --- old/autoyast2-2.19.4/doc/RulesAndClasses.xml 2010-01-25 11:30:26.000000000 +0100 +++ new/autoyast2-2.19.5/doc/RulesAndClasses.xml 2010-03-24 10:08:51.000000000 +0100 @@ -351,7 +351,7 @@ <para> If you are unsure about a value on your system, start an autoinstallation. If the proposal shows up, switch to the console via CTRL+ALT+F2 and run - <screen>y2base ayast_probe ncurses + <screen>/usr/lib/YaST2/bin/y2base ayast_probe ncurses </screen>. It might help to to turn the confirmation on for this, so that the installation does not start in the background while you are watching the values. The textbox with the values is scrollable. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.4/doc/ScriptsSection.xml new/autoyast2-2.19.5/doc/ScriptsSection.xml --- old/autoyast2-2.19.4/doc/ScriptsSection.xml 2010-03-05 11:10:40.000000000 +0100 +++ new/autoyast2-2.19.5/doc/ScriptsSection.xml 2010-03-26 13:13:26.000000000 +0100 @@ -131,6 +131,12 @@ <para><screen><debug config:type="boolean">true</debug></screen></para></entry> <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> </row> + <row> + <entry>notification</entry> + <entry>This text will be shown in a popup for the time the script is running in the background + <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> + </row> </tbody> </tgroup> </table> @@ -147,7 +153,7 @@ This type of script is available since openSUSE 11.2 (not SLES11). </para> <para> - The following elements must be between the <scripts><postpartitioning-scripts config:type="list"><script> ... </script></postpartitioning-sripts>...</scripts> tags + The following elements must be between the <scripts><postpartitioning-scripts config:type="list"><script> ... </script></postpartitioning-scripts>...</scripts> tags </para> <para> <table frame='top'> @@ -213,6 +219,12 @@ <para><screen><debug config:type="boolean">true</debug></screen></para></entry> <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> </row> + <row> + <entry>notification</entry> + <entry>This text will be shown in a popup for the time the script is running in the background + <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> + </row> </tbody> </tgroup> </table> @@ -304,6 +316,12 @@ <para><screen><debug config:type="boolean">true</debug></screen></para></entry> <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> </row> + <row> + <entry>notification</entry> + <entry>This text will be shown in a popup for the time the script is running in the background + <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> + </row> </tbody> </tgroup> </table> @@ -396,6 +414,12 @@ <para><screen><debug config:type="boolean">true</debug></screen></para></entry> <entry>optional. The default is true. This option was invented with SL 10.1 / SLES10</entry> </row> + <row> + <entry>notification</entry> + <entry>This text will be shown in a popup for the time the script is running in the background + <para><screen><notification>Please wait while script is running ...</notification></screen></para></entry> + <entry>optional. If not configured, no notification popup will be shown. This option was invented with openSUSE 11.3 (not SLES11)</entry> + </row> </tbody> </tgroup> </table> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.4/src/dialogs/script_dialogs.ycp new/autoyast2-2.19.5/src/dialogs/script_dialogs.ycp --- old/autoyast2-2.19.4/src/dialogs/script_dialogs.ycp 2010-03-10 15:15:53.000000000 +0100 +++ new/autoyast2-2.19.5/src/dialogs/script_dialogs.ycp 2010-03-26 10:44:14.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Anas Nashif <nashif@suse.de> * - * $Id: script_dialogs.ycp 61228 2010-03-10 14:15:51Z ug $ + * $Id: script_dialogs.ycp 61507 2010-03-26 09:44:13Z ug $ */ { @@ -182,6 +182,9 @@ ), `VSpacing(1), `HBox( + `TextEntry(`id(`notification), `opt(`notify), _("Text of the notification popup"), script["notification"]:"" ) + ), + `HBox( `TextEntry(`id(`location), `opt(`notify), _("Script Location"), script["location"]:"" ) ), `HBox( @@ -213,6 +216,7 @@ UI::ChangeWidget (`id(`chrooted), `Enabled, false); UI::ChangeWidget (`id(`network), `Enabled, false); UI::ChangeWidget (`id(`feedback), `Enabled, false); + UI::ChangeWidget (`id(`notification), `Enabled, false); } if( size( (string)UI::QueryWidget( `id(`location), `Value ) ) > 0 ) { @@ -246,6 +250,7 @@ boolean chrooted = (boolean)UI::QueryWidget(`id(`chrooted), `Value); boolean network = (boolean)UI::QueryWidget(`id(`network), `Value); string location = (string)UI::QueryWidget(`id(`location), `Value); + string notification = (string)UI::QueryWidget(`id(`notification), `Value); if ( (source == "" && location == "" ) || scriptName == "") { @@ -257,7 +262,7 @@ } else { - AutoinstScripts::AddEditScript( scriptName, source, interpreter, type, chrooted, debug, feedback, network, feedback_type, location); + AutoinstScripts::AddEditScript( scriptName, source, interpreter, type, chrooted, debug, feedback, network, feedback_type, location, notification); } } else if (ret == `loadsource) @@ -278,21 +283,25 @@ UI::ChangeWidget (`id(`feedback), `Value, false); UI::ChangeWidget (`id(`chrooted), `Value, false); UI::ChangeWidget (`id(`network), `Value, false); + UI::ChangeWidget (`id(`notification), `Enabled, false); } else if( type == "chroot-scripts" ) { UI::ChangeWidget (`id(`chrooted), `Enabled, true); UI::ChangeWidget (`id(`feedback), `Enabled, true); UI::ChangeWidget (`id(`network), `Enabled, false); UI::ChangeWidget (`id(`network), `Value, false); + UI::ChangeWidget (`id(`notification), `Enabled, true); } else if( type == "post-scripts" ) { UI::ChangeWidget (`id(`chrooted), `Enabled, false); UI::ChangeWidget (`id(`chrooted), `Value, false); UI::ChangeWidget (`id(`feedback), `Enabled, true); + UI::ChangeWidget (`id(`notification), `Enabled, true); UI::ChangeWidget (`id(`network), `Enabled, true); } else if( type == "pre-scripts" ) { UI::ChangeWidget (`id(`chrooted), `Enabled, false); UI::ChangeWidget (`id(`chrooted), `Value, false); UI::ChangeWidget (`id(`feedback), `Enabled, true); UI::ChangeWidget (`id(`network), `Value, false); + UI::ChangeWidget (`id(`notification), `Enabled, true); UI::ChangeWidget (`id(`network), `Enabled, false); } } else if( ret == `feedback ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.4/src/modules/AutoinstScripts.ycp new/autoyast2-2.19.5/src/modules/AutoinstScripts.ycp --- old/autoyast2-2.19.4/src/modules/AutoinstScripts.ycp 2010-03-10 15:15:53.000000000 +0100 +++ new/autoyast2-2.19.5/src/modules/AutoinstScripts.ycp 2010-03-26 10:44:14.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Custom scripts * Authors: Anas Nashif <nashif@suse.de> * - * $Id: AutoinstScripts.ycp 61228 2010-03-10 14:15:51Z ug $ + * $Id: AutoinstScripts.ycp 61507 2010-03-26 09:44:13Z ug $ */ { @@ -148,6 +148,7 @@ return ($["filename":p["filename"]:"", "interpreter": p["interpreter"]:"", "source":p["source"]:"", + "notification":p["notification"]:"", "location":p["location"]:"", "feedback":p["feedback"]:false, "feedback_type":p["feedback_type"]:"", @@ -159,6 +160,7 @@ "interpreter": p["interpreter"]:"", "source":p["source"]:"", "location":p["location"]:"", + "notification":p["notification"]:"", "feedback":p["feedback"]:false, "feedback_type":p["feedback_type"]:"", "debug":p["debug"]:true, @@ -171,6 +173,7 @@ "interpreter": p["interpreter"]:"", "source":p["source"]:"", "chrooted":p["chrooted"]:false, + "notification":p["notification"]:"", "location":p["location"]:"", "feedback":p["feedback"]:false, "feedback_type":p["feedback_type"]:"", @@ -189,6 +192,7 @@ "interpreter": p["interpreter"]:"", "source":p["source"]:"", "location":p["location"]:"", + "notification":p["notification"]:"", "feedback":p["feedback"]:false, "feedback_type":p["feedback_type"]:"", "debug":p["debug"]:true @@ -366,7 +370,8 @@ boolean feedback, boolean network, string feedback_type, - string location + string location, + string notification ) { boolean mod = false; @@ -385,6 +390,7 @@ oldScript=add(oldScript,"network_needed",network); oldScript=add(oldScript,"feedback_type", feedback_type); oldScript=add(oldScript,"location", location); + oldScript=add(oldScript,"notification", notification); mod = true; return oldScript; @@ -407,6 +413,7 @@ script=add(script,"network_needed",network); script=add(script,"feedback_type", feedback_type); script=add(script,"location", location); + script=add(script,"notification", notification); merged=add(merged,script); } @@ -650,11 +657,13 @@ foreach( map s, scripts, ``{ string scriptInterpreter = s["interpreter"]:"shell"; - string scriptName = s["filename"]:type; + string scriptName = s["filename"]:""; if (scriptName=="") { map t = URL::Parse(s["location"]:""); scriptName=basename(t["path"]:""); + if( scriptName == "" ) + scriptName = type; } string scriptPath = ""; @@ -743,6 +752,9 @@ string executionString = ""; boolean showFeedback = s["feedback"]:false; + if( s["notification"]:"" != "" ) + Popup::ShowFeedback( "", s["notification"]:"" ); + if (scriptInterpreter == "shell") { string debug = ( s["debug"]:true ? "-x" : "" ); @@ -790,6 +802,9 @@ } string feedback = ""; + if( s["notification"]:"" != "" ) + Popup::ClearFeedback(); + if( executionString != "" ) { if( showFeedback ) { feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.4/src/modules/Profile.ycp new/autoyast2-2.19.5/src/modules/Profile.ycp --- old/autoyast2-2.19.4/src/modules/Profile.ycp 2009-04-08 14:23:27.000000000 +0200 +++ new/autoyast2-2.19.5/src/modules/Profile.ycp 2010-03-26 09:57:53.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Profile handling * Authors: Anas Nashif <nashif@suse.de> * - * $Id: Profile.ycp 56688 2009-04-08 12:22:51Z ug $ + * $Id: Profile.ycp 61506 2010-03-26 08:57:51Z ug $ */ { module "Profile"; @@ -140,7 +140,7 @@ current["general"] = remove( current["general"]:$[], "clock" ); } if( current["general","mode","final_halt"]:false ) { - map script = $[ "filename":"zzz_halt", "source":"shutdown -h now" ]; + map script = $[ "filename":"zzz_halt", "source":"chkconfig autoyast off\nshutdown -h now" ]; if( ! haskey( current, "scripts" ) ) current["scripts"] = $[]; if( ! haskey( current["scripts"]:$[], "init-scripts" ) ) @@ -148,7 +148,7 @@ current["scripts","init-scripts"] = add( current["scripts","init-scripts"]:[], script ); } if( current["general","mode","final_reboot"]:false ) { - map script = $[ "filename":"zzz_reboot", "source":"shutdown -r now" ]; + map script = $[ "filename":"zzz_reboot", "source":"chkconfig autoyast off\nshutdown -r now" ]; if( ! haskey( current, "scripts" ) ) current["scripts"] = $[]; if( ! haskey( current["scripts"]:$[], "init-scripts" ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-2.19.4/src/schema/scripts.rnc new/autoyast2-2.19.5/src/schema/scripts.rnc --- old/autoyast2-2.19.4/src/schema/scripts.rnc 2009-07-01 11:09:33.000000000 +0200 +++ new/autoyast2-2.19.5/src/schema/scripts.rnc 2010-03-25 13:47:47.000000000 +0100 @@ -38,7 +38,8 @@ element location { text }? & source? & debug? & - feedback? + feedback? & + element notification { text }? } autoinstall-init-script = element script { @@ -55,7 +56,8 @@ source? & debug? & feedback? & - feedback_type? + feedback_type? & + element notification { text }? } chrooted = element chrooted { BOOLEAN } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org