Author: locilka Date: Wed Apr 16 15:11:00 2008 New Revision: 46736 URL: http://svn.opensuse.org/viewcvs/yast?rev=46736&view=rev Log: - Running runlevel proposal after software proposal (bnc #380141). - Using new possibility to disable and then reenable package callbacks (system_analysis, deploy_images). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_system_analysis.ycp trunk/installation/src/clients/inst_upgrade_urls.ycp trunk/installation/src/modules/ImageInstallation.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-instal... ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Apr 16 15:11:00 2008 @@ -2,6 +2,8 @@ Wed Apr 16 14:20:06 CEST 2008 - locilka@suse.cz - Running runlevel proposal after software proposal (bnc #380141). +- Using new possibility to disable and then reenable package + callbacks (system_analysis, deploy_images). ------------------------------------------------------------------- Tue Apr 15 11:45:18 CEST 2008 - locilka@suse.cz Modified: trunk/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sys... ============================================================================== --- trunk/installation/src/clients/inst_system_analysis.ycp (original) +++ trunk/installation/src/clients/inst_system_analysis.ycp Wed Apr 16 15:11:00 2008 @@ -27,6 +27,7 @@ import "StorageControllers"; import "StorageDevices"; import "Wizard"; +import "PackageCallbacks"; include "installation/misc.ycp"; include "packager/storage_include.ycp"; @@ -142,18 +143,27 @@ boolean packager_initialized = false; boolean InitInstallationRepositoriesReal () { + // disable callbacks + PackageCallbacks::RegisterEmptyProgressCallbacks(); + + boolean ret = true; + Packages::InitializeCatalogs (); + if (Packages::InitFailed ()) { // popup message Popup::Message (_("Failed to initialize the software repositories. Aborting the installation.")); - return false; + ret = false; + } else { + packager_initialized = true; + Packages::InitializeAddOnProducts (); } - packager_initialized = true; - Packages::InitializeAddOnProducts (); + // reregister callbacks + PackageCallbacks::RestorePreviousProgressCallbacks(); - return true; + return ret; } boolean InitInstallationRepositories () { Modified: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_upg... ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Wed Apr 16 15:11:00 2008 @@ -19,18 +19,29 @@ textdomain "installation"; symbol ret = `next; - if (GetInstArgs::going_back()) ret = `back; + if (GetInstArgs::going_back()) + ret = `back; - // --> Comment this out in case of testing on a running system - if (! Stage::initial()) { - y2milestone ("Not an initial stage"); - return ret; - } - if (! Mode::update()) { - y2milestone ("Not an udpate mode"); - return ret; + boolean test_mode = false; + + if (size (WFM::Args()) > 0 && is (WFM::Args(0), string)) { + y2milestone ("Args: %1", WFM::Args()); + if (WFM::Args(0) == "test") + test_mode = true; + } + + if (test_mode) { + y2milestone ("Test mode"); + } else { + if (! Stage::initial()) { + y2milestone ("Not an initial stage"); + return ret; + } + if (! Mode::update()) { + y2milestone ("Not an udpate mode"); + return ret; + } } - // <-- string dir_old = sformat ("%1/var/lib/zypp/db/sources/", Installation::destdir); list <map <string, any> > old_urls = []; Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIns... ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Wed Apr 16 15:11:00 2008 @@ -23,6 +23,7 @@ import "Report"; import "String"; import "Arch"; +import "PackageCallbacks"; textdomain "installation"; @@ -475,6 +476,9 @@ * @param progress a function to report overal progress */ global boolean DeployImages (list<string> images, string target, void(integer,integer) progress) { + // unregister callbacks + PackageCallbacks::RegisterEmptyProgressCallbacks(); + FillUpImagesDetails(); integer num = -1; @@ -483,8 +487,11 @@ num = num + 1; progress (num, 0); DeployImage (img, target); + progress (num, 100); }); - progress (num, 100); + + // reregister callbacks + PackageCallbacks::RestorePreviousProgressCallbacks(); return true; // TODO error checking @@ -751,8 +758,8 @@ /** * List of all handled types. */ - // list <symbol> all_supported_types = [`product, `pattern, `selection, `language, `package, `patch]; - // Zypp currently counts [ `product, `pattern, `selection, `language ] + // list <symbol> all_supported_types = [`product, `pattern, `language, `package, `patch]; + // Zypp currently counts [ `product, `pattern, `language ] list <symbol> all_supported_types = [`package, `patch]; /** Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.s... ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Wed Apr 16 15:11:00 2008 @@ -4,16 +4,16 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite -# anyxml -> barexml (bnc #366867) -BuildRequires: yast2 >= 2.16.39 +# PackageCallbacks::RegisterEmptyProgressCallbacks() +BuildRequires: yast2 >= 2.16.52 # SourceManager::InstInitSourceMoveDownloadArea BuildRequires: yast2-packager >= 2.16.32 Requires: autoyast2-installation -# GetInstArgs::automatic_configuration -Requires: yast2 >= 2.16.46 +# PackageCallbacks::RegisterEmptyProgressCallbacks() +Requires: yast2 >= 2.16.52 # Required in in the first stage, after # switching to the installed system, bugzilla #249679 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org