Author: aschnell Date: Tue May 17 14:36:52 2011 New Revision: 64016 URL: http://svn.opensuse.org/viewcvs/yast?rev=64016&view=rev Log: - adapted to yast2-storage backport change Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/include/misc.ycp branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/VERSION?rev=64016&r1=64015&r2=64016&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Tue May 17 14:36:52 2011 @@ -1 +1 @@ -2.17.79 +2.17.80 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes?rev=64016&r1=64015&r2=64016&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Tue May 17 14:36:52 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 17 14:33:58 CEST 2011 - aschnell@suse.de + +- adapted to yast2-storage backport change +- 2.17.80 + +------------------------------------------------------------------- Wed Apr 27 15:09:25 CEST 2011 - jsuchome@suse.cz - added option to configure FCoE Interfaces when started with Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/src/include/misc.ycp?rev=64016&r1=64015&r2=64016&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/include/misc.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/include/misc.ycp Tue May 17 14:36:52 2011 @@ -139,8 +139,11 @@ // Text for confirmation popup before the installation really starts 1/3 body = _("<p>All information required for the base installation is now complete.</p>"); - map commit_info = Storage::GetCommitInfo(); - if (commit_info[`destructive]:false) + boolean some_destructive = find(map info, Storage::GetCommitInfos(), { + return info[`destructive]:false; + }) != nil; + + if (some_destructive) { // Text for confirmation popup before the installation really starts 2/3 body = body + _("<p>If you continue now, <b>existing Modified: branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in?rev=64016&r1=64015&r2=64016&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/yast2-installation.spec.in Tue May 17 14:36:52 2011 @@ -40,8 +40,8 @@ # New API to ProductLicense module Requires: yast2-packager >= 2.17.64 -# Storage::GetCommitInfo() call in include/misc.ycp -Requires: yast2-storage >= 2.17.47 +# Storage::GetCommitInfos() call in include/misc.ycp +Requires: yast2-storage >= 2.17.101 # use in startup scripts Requires: initviocons -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org