Hello community,
here is the log from the commit of package autoyast2
checked in at Wed Jan 9 21:50:57 CET 2008.
--------
--- autoyast2/autoyast2.changes 2007-12-07 11:56:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2008-01-08 14:47:59.365169000 +0100
@@ -1,0 +2,12 @@
+Tue Jan 8 13:50:59 CET 2008 - ug@suse.de
+
+- experimental interactive scripts code added
+- Buildrequires fixed
+- 2.16.4
+
+-------------------------------------------------------------------
+Wed Jan 2 13:24:05 CET 2008 - ug@suse.de
+
+- endless loop in pre-script fixed (#351103)
+
+-------------------------------------------------------------------
Old:
----
autoyast2-2.16.3.tar.bz2
New:
----
autoyast2-2.16.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.S12362/_old 2008-01-09 21:50:15.000000000 +0100
+++ /var/tmp/diff_new_pack.S12362/_new 2008-01-09 21:50:15.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package autoyast2 (Version 2.16.3)
+# spec file for package autoyast2 (Version 2.16.4)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,14 +12,14 @@
Name: autoyast2
Url: http://www.suse.de/~ug
-Version: 2.16.3
+Version: 2.16.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.16.3.tar.bz2
+Source0: autoyast2-2.16.4.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-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update
+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
Requires: yast2-core yast2-xml libxslt yast2-installation
Requires: autoyast2-installation = %{version}
@@ -50,7 +50,7 @@
Anas Nashif
%package installation
-Version: 2.16.3
+Version: 2.16.4
Release: 1
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
@@ -73,7 +73,7 @@
Anas Nashif
%prep
-%setup -n autoyast2-2.16.3
+%setup -n autoyast2-2.16.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -212,8 +212,13 @@
%dir /var/adm/autoinstall/cache
%dir /var/lib/autoinstall
%dir /var/lib/autoinstall/autoconf
-
%changelog
+* Tue Jan 08 2008 - ug@suse.de
+- experimental interactive scripts code added
+- Buildrequires fixed
+- 2.16.4
+* Wed Jan 02 2008 - ug@suse.de
+- endless loop in pre-script fixed (#351103)
* Fri Dec 07 2007 - ug@suse.de
- 2.16.3
* Mon Dec 03 2007 - ug@suse.de
++++++ autoyast2-2.16.3.tar.bz2 -> autoyast2-2.16.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.3/configure new/autoyast2-2.16.4/configure
--- old/autoyast2-2.16.3/configure 2007-12-07 11:48:23.000000000 +0100
+++ new/autoyast2-2.16.4/configure 2008-01-08 14:46:01.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.3.
+# Generated by GNU Autoconf 2.61 for autoyast2 2.16.4.
#
# 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.3'
-PACKAGE_STRING='autoyast2 2.16.3'
+PACKAGE_VERSION='2.16.4'
+PACKAGE_STRING='autoyast2 2.16.4'
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.3 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.16.4 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.3:";;
+ short | recursive ) echo "Configuration of autoyast2 2.16.4:";;
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.3
+autoyast2 configure 2.16.4
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.3, which was
+It was created by autoyast2 $as_me 2.16.4, 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.3'
+ VERSION='2.16.4'
cat >>confdefs.h <<_ACEOF
@@ -2416,7 +2416,7 @@
-VERSION="2.16.3"
+VERSION="2.16.4"
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.3, which was
+This file was extended by autoyast2 $as_me 2.16.4, 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.3
+autoyast2 config.status 2.16.4
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.3/configure.in new/autoyast2-2.16.4/configure.in
--- old/autoyast2-2.16.3/configure.in 2007-12-07 11:48:18.000000000 +0100
+++ new/autoyast2-2.16.4/configure.in 2008-01-08 14:45:56.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.3, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.16.4, 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.3"
+VERSION="2.16.4"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.3/src/modules/AutoinstScripts.ycp new/autoyast2-2.16.4/src/modules/AutoinstScripts.ycp
--- old/autoyast2-2.16.3/src/modules/AutoinstScripts.ycp 2007-11-14 12:15:05.000000000 +0100
+++ new/autoyast2-2.16.4/src/modules/AutoinstScripts.ycp 2008-01-08 13:51:24.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Custom scripts
* Authors: Anas Nashif
*
- * $Id: AutoinstScripts.ycp 42038 2007-11-14 11:15:26Z ug $
+ * $Id: AutoinstScripts.ycp 43322 2008-01-08 12:52:45Z ug $
*/
{
@@ -17,6 +17,7 @@
import "URL";
import "Service";
import "Popup";
+ import "Label";
include "autoinstall/io.ycp";
@@ -382,6 +383,126 @@
}
+/*
+bidirectional feedback during script execution
+Experimental
+*/
+
+ define map splitParams( string s ) ``{
+ list<string> l = splitstring( s, "|" );
+ map ret = $[];
+ l = remove( l, 0 );
+ foreach( string element, l, ``{
+ list<string> p = splitstring( element, "=" );
+ ret[ p[0]:"" ] = p[1]:"";
+ });
+ return ret;
+ }
+
+ define void interactiveScript( string shell, string debug, string scriptPath, string current_logdir, string scriptName ) ``{
+ map data = $[];
+ string widget = "";
+ SCR::Execute(.target.remove, "/tmp/ay_opipe");
+ SCR::Execute(.target.remove, "/tmp/ay_ipipe");
+ SCR::Execute(.target.bash, "mkfifo -m 660 /tmp/ay_opipe", $[]);
+ SCR::Execute(.target.bash, "mkfifo -m 660 /tmp/ay_ipipe", $[]);
+ string execute = sformat("%1 %2 %3 2&> %4/%5.log ", shell, debug, scriptPath, current_logdir, scriptName);
+ SCR::Execute(.target.bash_background, "OPIPE=/tmp/ay_opipe IPIPE=/tmp/ay_ipipe "+execute, $[]);
+ boolean run = true;
+ boolean ok_button = false;
+ term vbox = `VBox();
+
+ list<string> buffer = [];
+ while( SCR::Read(.target.lstat, "/tmp/ay_opipe") != $[] && run ) {
+ data = (map)SCR::Execute (.target.bash_output, "cat /tmp/ay_opipe", $[]);
+ buffer = splitstring( data["stdout"]:"", "\n" );
+ while( buffer != [] ) {
+ string line = buffer[0]:"";
+ buffer = remove( buffer, 0 );
+ if( size(line) == 0 )
+ continue;
+ data["stdout"] = line;
+ y2milestone("working on line %1", line);
+ if( substring( data["stdout"]:"", 0, 8 ) == "__EXIT__" ) {
+ if ( widget == "radiobutton" ) {
+ vbox = add( vbox, `PushButton(`id(`ok), Label::OKButton() ) );
+ UI::OpenDialog( `RadioButtonGroup(`id(`rb), vbox) );
+ }
+ if( ok_button == true ) {
+ UI::ChangeWidget(`id(`ok) , `Enabled, true);
+ any ret = UI::UserInput();
+ if( widget == "radiobutton" ) {
+ any val = UI::QueryWidget(`id(`rb), `CurrentButton);
+ SCR::Execute (.target.bash, sformat("echo \"%1\" > /tmp/ay_ipipe", 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) ), $[]);
+ }
+ ok_button = false;
+ }
+ vbox = `VBox();
+ if( widget == "" )
+ run = false;
+ else
+ UI::CloseDialog();
+ widget = "";
+ } else if( substring( data["stdout"]:"", 0, 12 ) == "__PROGRESS__" ) {
+ map params = splitParams( data["stdout"]:"" );
+ UI::OpenDialog(
+ `VBox( `ProgressBar(`id(`pr), params["label"]:"", tointeger(params["max"]:"100"), 0 ) )
+ );
+ widget = "progressbar";
+ } else if( substring( data["stdout"]:"", 0, 8 ) == "__TEXT__" ) {
+ map params = splitParams( data["stdout"]:"" );
+ integer hspace = tointeger(params["width"]:"10");
+ integer vspace = tointeger(params["height"]:"20");
+ ok_button = haskey(params, "okbutton")?true:false;
+ vbox = `VBox( `HSpacing(hspace), `HBox( `VSpacing(vspace), `RichText( `id( `mle ), "" ) ) );
+ if( ok_button == true )
+ vbox = add( vbox, `PushButton(`id(`ok), Label::OKButton() ) );
+ UI::OpenDialog( vbox );
+ if( ok_button == true )
+ UI::ChangeWidget(`id(`ok) , `Enabled, false);
+ widget = "text";
+ } else if( substring( data["stdout"]:"", 0, 9 ) == "__ENTRY__" ) {
+ map params = splitParams( data["stdout"]:"" );
+ if( haskey( params, "description" ) ) {
+ vbox = add( vbox, `HSpacing(40) );
+ vbox = add( vbox, `RichText( params["description"]:"" ) );
+ }
+ vbox = add( vbox, `TextEntry( `id(`ay_entry), params["label"]:"", params["default"]:"" ) );
+ vbox = add( vbox, `PushButton(`id(`ok), Label::OKButton() ) );
+ UI::OpenDialog( vbox );
+ widget = "entry";
+ ok_button = true;
+ } else if( substring( data["stdout"]:"", 0, 15 ) == "__RADIOBUTTON__" ) {
+ map params = splitParams( data["stdout"]:"" );
+ if( haskey( params, "description" ) ) {
+ vbox = add( vbox, `HSpacing(60) );
+ vbox = add( vbox, `RichText( params["description"]:"" ) );
+ }
+ widget = "radiobutton";
+ ok_button = true;
+ } else {
+ if( widget == "progressbar" ) {
+ UI::ChangeWidget(`id(`pr), `Value, tointeger(data["stdout"]:"0") );
+ } else if( widget == "text" ) {
+ UI::ChangeWidget(`id(`mle), `Value, (string)UI::QueryWidget(`id(`mle), `Value)+data["stdout"]:"" );
+ } else if( widget == "radiobutton" ) {
+ if( substring( data["stdout"]:"", 0, 10 ) == "__BUTTON__" ) {
+ map params = splitParams( data["stdout"]:"" );
+ vbox = add( vbox, `Left(`RadioButton(`id(params["val"]:""), params["label"]:"")) );
+ } else {
+ y2milestone("*urgs* received '%1' instead of '__BUTTON__' during RADIOBUTTON creation",data["stdout"]:"");
+ }
+ }
+ }
+ };
+ };
+ SCR::Execute (.target.remove, "/tmp/ay_opipe");
+ SCR::Execute (.target.remove, "/tmp/ay_ipipe");
+ }
+
/**
* Execute pre scripts
@@ -554,174 +675,58 @@
string executionString = "";
boolean showFeedback = s["feedback"]:false;
-
if (scriptInterpreter == "shell")
{
string debug = ( s["debug"]:true ? "-x" : "" );
- 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);
+ if( SCR::Read (.target.size, scriptPath+"-run" ) == -1 || s["rerun"]:false == true ) {
+ if( s["interactive"]:false == true ) {
+ interactiveScript( "/bin/sh", debug, scriptPath, current_logdir, scriptName );
+ } 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);
+ SCR::Execute (.target.bash, "/bin/touch $FILE", $["FILE":scriptPath+"-run"]);
+ }
+ }
}
else if (scriptInterpreter == "perl")
{
string debug = ( s["debug"]:true ? "-w" : "" );
- 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);
+ 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"]);
+ }
}
else if (scriptInterpreter == "python")
{
- 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);
+ 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"]);
+ }
}
else
{
y2error("Unknown interpreter: %1", scriptInterpreter);
}
string feedback = "";
- if( showFeedback ) {
- feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" );
- }
- if( size(feedback) > 0 ) {
- Popup::LongText(type, `RichText(`opt(`plainText), feedback), 50, 20 );
+
+ if( executionString != "" ) {
+ if( showFeedback ) {
+ feedback = (string)SCR::Read(.target.string, current_logdir+"/"+scriptName+".log" );
+ }
+ if( size(feedback) > 0 ) {
+ Popup::LongText(type, `RichText(`opt(`plainText), feedback), 50, 20 );
+ }
}
}
});
return true;
}
-
-
-// EOF
-}
-
-/*
-bidirectional feedback during script execution
-Experimental
-
-{
- import "UI";
- import "Label";
- textdomain "autoinst";
-
- define map splitParams( string s ) ``{
- list<string> l = splitstring( s, ":" );
- map ret = $[];
- l = remove( l, 0 );
- y2milestone("XXX %1",l);
- foreach( string element, l, ``{
- list<string> p = splitstring( element, "=" );
- ret[ p[0]:"" ] = p[1]:"";
- });
- y2milestone("UWE %1",ret);
- return ret;
- }
-
- define void go () ``{
- map data = $[];
- string widget = "";
- SCR::Execute(.target.bash, "mkfifo -m 660 /tmp/ay_opipe", $[]);
- SCR::Execute(.target.bash, "mkfifo -m 660 /tmp/ay_ipipe", $[]);
- SCR::Execute(.target.bash_background, "OPIPE=/tmp/ay_opipe IPIPE=/tmp/ay_ipipe /tmp/test.sh", $[]);
- boolean run = true;
- list<string> buffer = [];
- while( SCR::Read(.target.lstat, "/tmp/ay_opipe") != $[] && run ) {
- data = (map)SCR::Execute (.target.bash_output, "cat /tmp/ay_opipe", $[]);
- y2milestone("read: %1",data);
- buffer = splitstring( data["stdout"]:"", "\n" );
- while( buffer != [] ) {
- string line = buffer[0]:"";
- buffer = remove( buffer, 0 );
- if( size(line) == 0 )
- continue;
- data["stdout"] = line;
- y2milestone("working on line %1",line);
- if( substring( data["stdout"]:"", 0, 12 ) == "__PROGRESS__" ) {
- map params = splitParams( data["stdout"]:"" );
- if( widget != "" )
- UI::CloseDialog();
- UI::OpenDialog(
- `VBox( `ProgressBar(`id(`pr), params["label"]:"", tointeger(params["max"]:"100"), 0 ) )
- );
- widget = "progressbar";
- } else if( substring( data["stdout"]:"", 0, 8 ) == "__TEXT__" ) {
- map params = splitParams( data["stdout"]:"" );
- integer hspace = tointeger(params["width"]:"10");
- integer vspace = tointeger(params["height"]:"20");
- if( widget != "" )
- UI::CloseDialog();
- UI::OpenDialog(
- `VBox( `HSpacing(hspace), `HBox( `VSpacing(vspace), `MultiLineEdit( `id( `mle ), "label", "" ) ) ) );
- widget = "text";
- } else if( substring( data["stdout"]:"", 0, 9 ) == "__ENTRY__" ) {
- map params = splitParams( data["stdout"]:"" );
- UI::OpenDialog(
- `VBox( `TextEntry( `id(`ay_entry), params["label"]:"", params["default"]:"" ), `PushButton(`id(`ok), Label::OKButton() ) )
- );
- any ret = UI::UserInput();
- any val = UI::QueryWidget(`id(`ay_entry), `Value);
- SCR::Execute (.target.bash, sformat("echo \"%1\" > /tmp/ay_ipipe", (string)(val) ), $[]);
- UI::CloseDialog();
- } else if( substring( data["stdout"]:"", 0, 15 ) == "__RADIOBUTTON__" ) {
- boolean run2 = true;
- term vbox = `VBox();
- if( widget != "" )
- UI::CloseDialog();
- widget = "radiobutton";
- while( SCR::Read(.target.lstat, "/tmp/ay_opipe") != $[] && run2 == true ) {
- if( buffer == [] ) {
- data = (map)SCR::Execute (.target.bash_output, "cat /tmp/ay_opipe", $[]);
- buffer = splitstring( data["stdout"]:"", "\n" );
- }
- integer idCnt = 0;
- while( buffer != [] ) {
- string line = buffer[0]:"";
- buffer = remove( buffer, 0 );
- y2milestone("working on line: %1",line);
- if( size(line) == 0 )
- continue;
- data["stdout"] = line;
- if( substring( data["stdout"]:"", 0, 10 ) == "__BUTTON__" ) {
- map params = splitParams( data["stdout"]:"" );
- vbox = add( vbox, `Left(`RadioButton(`id(params["val"]:""), params["label"]:"")) );
- idCnt = idCnt + 1;
- } else if( substring( data["stdout"]:"", 0, 8 ) == "__EXIT__" ) {
- run2 = false;
- vbox = add( vbox, `PushButton(`id(`ok), Label::OKButton() ) );
- } else {
- y2milestone("bad thing happened. Neither 'BUTTON' nor 'EXIT' found in 'RADIOBUTTON' : %1",data["stdout"]:"");
- }
- };
- }
- UI::OpenDialog(
- `RadioButtonGroup(`id(`rb),
- vbox
- )
- );
- any ret = UI::UserInput();
- any val = UI::QueryWidget(`id(`rb), `CurrentButton);
- SCR::Execute (.target.bash, sformat("echo \"%1\" > /tmp/ay_ipipe", val ), $[]);
- UI::CloseDialog();
- } else if( substring( data["stdout"]:"", 0, 8 ) == "__EXIT__" ) {
- run = false;
- } else {
- if( widget == "progressbar" ) {
- UI::ChangeWidget(`id(`pr), `Value, tointeger(data["stdout"]:"0") );
- } else if( widget == "text" ) {
- UI::ChangeWidget(`id(`mle), `Value, (string)UI::QueryWidget(`id(`mle), `Value)+data["stdout"]:""+"\n" );
- }
- }
- };
- };
- SCR::Execute (.target.remove, "/tmp/ay_opipe");
- SCR::Execute (.target.remove, "/tmp/ay_ipipe");
- }
- go();
- UI::CloseDialog();
}
-
-
-*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.3/src/modules/Profile.ycp new/autoyast2-2.16.4/src/modules/Profile.ycp
--- old/autoyast2-2.16.3/src/modules/Profile.ycp 2007-12-04 11:41:29.000000000 +0100
+++ new/autoyast2-2.16.4/src/modules/Profile.ycp 2007-12-17 17:22:01.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Profile handling
* Authors: Anas Nashif
*
- * $Id: Profile.ycp 42647 2007-12-04 10:42:12Z ug $
+ * $Id: Profile.ycp 43147 2007-12-17 16:23:00Z ug $
*/
{
module "Profile";
@@ -644,6 +644,12 @@
}
current = XML::XMLToYCPString( out["stdout"]:"" );
AutoinstConfig::ProfileEncrypted = true;
+
+ // FIXME: rethink and check for sanity of that!
+ // save decrypted profile for modifying pre-scripts
+ if( Stage::initial() )
+ //SCR::Write(.target.string, AutoinstConfig::profile_dir+"/autoinst.xml", out["stdout"]:"");
+ SCR::Write(.target.string, file, out["stdout"]:"");
} else {
y2debug("Reading %1", file);
current = XML::XMLToYCPFile(file);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.16.3/VERSION new/autoyast2-2.16.4/VERSION
--- old/autoyast2-2.16.3/VERSION 2007-12-07 11:47:38.000000000 +0100
+++ new/autoyast2-2.16.4/VERSION 2008-01-08 14:29:15.000000000 +0100
@@ -1 +1 @@
-2.16.3
+2.16.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org