Author: locilka Date: Tue Oct 21 17:03:21 2008 New Revision: 52404 URL: http://svn.opensuse.org/viewcvs/yast?rev=52404&view=rev Log: - Added handling for globals->debug_deploying (bnc #436842). Modified: trunk/installation/control/docs/control-section.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_deploy_image.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/control/docs/control-section.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/control-section.xml?rev=52404&r1=52403&r2=52404&view=diff ============================================================================== --- trunk/installation/control/docs/control-section.xml (original) +++ trunk/installation/control/docs/control-section.xml Tue Oct 21 17:03:21 2008 @@ -441,6 +441,18 @@ xmlns:xi="http://www.w3.org/2001/XInclude"/> </programlisting> </listitem> + + <listitem><para>(boolean) <emphasis>debug_workflow</emphasis> - defines whether steps + with the very same name in workflow should not be collapsed. If <emphasis>true</emphasis> + steps are not collapsed and a step ID is added after the step name. The default + is <emphasis>false</emphasis>. This feature should be off in the production phase.</para> + </listitem> + + <listitem><para>(boolean) <emphasis>debug_deploying</emphasis> - defines whether deploying + should write more debug logs and some more debugging features in the workflow. + The default is <emphasis>false</emphasis>. + This feature should be off in the production phase.</para> + </listitem> </itemizedlist> </section> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=52404&r1=52403&r2=52404&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Oct 21 17:03:21 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 21 16:46:00 CEST 2008 - locilka@suse.cz + +- Added handling for globals->debug_deploying (bnc #436842). + +------------------------------------------------------------------- Mon Oct 20 12:56:32 CEST 2008 - locilka@suse.cz - Fixed a typo (bnc #436471). Modified: trunk/installation/src/clients/inst_deploy_image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_deploy_image.ycp?rev=52404&r1=52403&r2=52404&view=diff ============================================================================== --- trunk/installation/src/clients/inst_deploy_image.ycp (original) +++ trunk/installation/src/clients/inst_deploy_image.ycp Tue Oct 21 17:03:21 2008 @@ -7,6 +7,7 @@ import "String"; import "PackageCallbacks"; import "SlideShow"; +import "Report"; textdomain "installation"; @@ -194,6 +195,14 @@ } } +void RunPackageManager () { + y2milestone ("--- running the package manager ---"); + UI::OpenDialog (`opt(`defaultsize), `PackageSelector(`id (`packages), `opt (`summaryMode))); + UI::RunPkgSelection (`id(`packages)); + UI::CloseDialog(); + y2milestone ("--- running the package manager ---"); +} + ImageInstallation::SetDeployTarImageProgress (SetOneImageProgress); ImageInstallation::SetDownloadTarImageProgress (MyProgressDownloadHandler); ImageInstallation::SetOverallDeployingProgress (OverallProgressHandler); @@ -266,6 +275,14 @@ // Restore the states stored by StoreAllChanges() ImageInstallation::RestoreAllChanges(); +// BNC #436842 - debug feature in control file +if (ProductFeatures::GetBooleanFeature("globals", "debug_deploying") == true) { + // TRANSLATORS: pop-up message + Report::Message (_("Debugging has been turned on. +YaST will open a package manager for you to check the current status of packages.")); + RunPackageManager(); +} + // bnc #395030 // Use less memory ImageInstallation::FreeInternalVariables(); Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=52404&r1=52403&r2=52404&view=diff ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Tue Oct 21 17:03:21 2008 @@ -26,6 +26,8 @@ import "PackageCallbacks"; import "Popup"; import "SlideShow"; +import "ProductControl"; +import "ProductFeatures"; textdomain "installation"; @@ -90,6 +92,17 @@ global boolean changed_by_user = false; +boolean debug_mode = nil; + +boolean ThisIsADebugMode () { + if (debug_mode == nil) { + debug_mode = (ProductFeatures::GetBooleanFeature("globals", "debug_deploying") == true); + y2milestone ("ImageInstallation debug mode: %1", debug_mode); + } + + return debug_mode; +} + /** * Set the repository to get images from * @param repo integer the repository identification @@ -936,6 +949,8 @@ // if status is `installed and locked is true then the object locked list