January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60515 - /tags/branch-Code-11-SP1-2_17_8/backup/
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:44:03 2010 New Revision: 60515 URL: http://svn.opensuse.org/viewcvs/yast?rev=60515&view=rev Log: Created tag branch-Code-11-SP1-2_17_8 for backup Added: tags/branch-Code-11-SP1-2_17_8/backup/ (props changed) - copied from r60514, branches/SuSE-Code-11-SP1-Branch/backup/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60514 - in /branches/SuSE-Code-11-Branch/backup: package/yast2-backup.changes src/ui.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:42:29 2010 New Revision: 60514 URL: http://svn.opensuse.org/viewcvs/yast?rev=60514&view=rev Log: - Fixed low speed of automatic backup (BNC #568615). Modified: branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes branches/SuSE-Code-11-Branch/backup/src/ui.ycp Modified: branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/backup/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Code-11-Branch/backup/package/yast2-backup.changes Mon Jan 25 16:42:29 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 25 16:36:47 CET 2010 - locilka(a)suse.cz + +- Fixed low speed of automatic backup (BNC #568615). + +------------------------------------------------------------------- Wed Dec 2 15:41:11 CET 2009 - locilka(a)suse.cz - Fixed infinite loop in case of old archives to keep set to zero Modified: branches/SuSE-Code-11-Branch/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/backup/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/backup/src/ui.ycp (original) +++ branches/SuSE-Code-11-Branch/backup/src/ui.ycp Mon Jan 25 16:42:29 2010 @@ -181,7 +181,7 @@ if ((boolean) SCR::Read (.process.running, backup_PID)) { - sleep(wait); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait); ret = (symbol) UI::PollInput(); @@ -1956,7 +1956,8 @@ } if (Backup::cron_mode) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } else { @@ -2073,7 +2074,8 @@ if (Backup::cron_mode == true) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } @@ -2826,7 +2828,7 @@ if (Backup::cron_mode) { ret = nil; - sleep(wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); CheckFreeSpace(); } else { ret = waitForUserOrProcess(wait_time, `changed); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60513 - in /branches/SuSE-Code-11-SP1-Branch/backup: VERSION package/yast2-backup.changes src/ui.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:41:55 2010 New Revision: 60513 URL: http://svn.opensuse.org/viewcvs/yast?rev=60513&view=rev Log: - Fixed low speed of automatic backup (BNC #568615). - 2.17.8 Modified: branches/SuSE-Code-11-SP1-Branch/backup/VERSION branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp Modified: branches/SuSE-Code-11-SP1-Branch/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/VERSION Mon Jan 25 16:41:55 2010 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes Mon Jan 25 16:41:55 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 25 16:36:47 CET 2010 - locilka(a)suse.cz + +- Fixed low speed of automatic backup (BNC #568615). +- 2.17.8 + +------------------------------------------------------------------- Mon Dec 7 11:27:04 CET 2009 - locilka(a)suse.cz - Fixed RPM dependencies Modified: branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/src/ui.ycp Mon Jan 25 16:41:55 2010 @@ -181,7 +181,7 @@ if ((boolean) SCR::Read (.process.running, backup_PID)) { - sleep(wait); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait); ret = (symbol) UI::PollInput(); @@ -1956,7 +1956,8 @@ } if (Backup::cron_mode) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } else { @@ -2073,7 +2074,8 @@ if (Backup::cron_mode == true) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } @@ -2826,7 +2828,7 @@ if (Backup::cron_mode) { ret = nil; - sleep(wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); CheckFreeSpace(); } else { ret = waitForUserOrProcess(wait_time, `changed); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60512 - in /trunk/backup: package/yast2-backup.changes src/ui.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 16:39:07 2010 New Revision: 60512 URL: http://svn.opensuse.org/viewcvs/yast?rev=60512&view=rev Log: - Fixed low speed of automatic backup (BNC #568615). Modified: trunk/backup/package/yast2-backup.changes trunk/backup/src/ui.ycp Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Mon Jan 25 16:39:07 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------ +Mon Jan 25 16:36:47 CET 2010 - locilka(a)suse.cz + +- Fixed low speed of automatic backup (BNC #568615). + +------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/ui.ycp?rev=60512&r1=6… ============================================================================== --- trunk/backup/src/ui.ycp (original) +++ trunk/backup/src/ui.ycp Mon Jan 25 16:39:07 2010 @@ -181,7 +181,7 @@ if (backup_PID != nil && (boolean) SCR::Read (.process.running, backup_PID)) { - sleep(wait); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait); ret = (symbol) UI::PollInput(); @@ -1950,7 +1950,7 @@ } if (Backup::cron_mode) { - sleep (wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep (wait_time); } else { ret = UI::PollInput(); @@ -1966,7 +1966,7 @@ } if (line == nil && errline == nil) - sleep (ui_wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep (ui_wait_time); } } @@ -2093,7 +2093,8 @@ } if (Backup::cron_mode) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } else { @@ -2210,7 +2211,8 @@ if (Backup::cron_mode == true) { - sleep(wait_time); + // BNC #568615: yast2 backup takes much longer when scheduled + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); ret = nil; } @@ -2963,7 +2965,7 @@ if (Backup::cron_mode) { ret = nil; - sleep(wait_time); + if ((boolean) SCR::Read (.process.buffer_empty, backup_PID) == true) sleep(wait_time); CheckFreeSpace(); } else { ret = waitForUserOrProcess(wait_time, `changed); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60511 - in /branches/SuSE-Code-11-SP1-Branch/support: package/yast2-support.changes src/Support.ycp
by mzugec＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: mzugec Date: Mon Jan 25 15:39:42 2010 New Revision: 60511 URL: http://svn.opensuse.org/viewcvs/yast?rev=60511&view=rev Log: bnc#447588 - remove progress dialog on start of support module Modified: branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp Modified: branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/suppo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/support/package/yast2-support.changes Mon Jan 25 15:39:42 2010 @@ -2,6 +2,7 @@ Mon Jan 18 09:51:55 CET 2010 - mzugec(a)suse.cz - fixed desktop file (Categories) +- bnc#447588 - remove progress dialog on start of support module - 2.17.19 ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/suppo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/support/src/Support.ycp Mon Jan 25 15:39:42 2010 @@ -244,52 +244,20 @@ /* Support read dialog caption */ string caption = _("Initializing support Configuration"); - // TODO FIXME Set the right number of stages - integer steps = 2; - - integer sl = 500; - sleep(sl); - - // TODO FIXME Names of real stages - // We do not set help text here, because it was set outside - Progress::New( caption, " ", steps, [ - /* Progress stage 1/3 */ - _("Read the configuration") - ], [ - /* Progress step 1/3 */ - _("Reading the database..."), - /* Progress step 2/3 */ - _("Reading the previous settings..."), - /* Progress step 3/3 */ - _("Detecting the devices..."), - /* Progress finished */ - _("Finished") - ], - "" - ); - - // read database - if(Abort()) return false; - Progress::NextStage(); configuration = (map)SCR::Read(.etc.supportconfig.all); foreach(map<string, any> row, configuration["value"]:[], { options[row["name"]:""]=row["value"]:""; }); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); - sleep(sl); - // read current settings - if(Abort()) return false; - Progress::NextStage(); if (PackageSystem::Installed("MozillaFirefox")) browser="firefox"; else if (PackageSystem::Installed("kde4-konqueror")||PackageSystem::Installed("kdebase3")) browser="konqueror"; else if (PackageSystem::Installed("opera")) browser="opera"; else y2error("Couldn't find any supported browser installed."); /* Error message */ if(false) Report::Error(Message::CannotReadCurrentSettings()); - sleep(sl); if(Abort()) return false; log_files=$[ "tmp_dir":(string)SCR::Read(.target.tmpdir) ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60510 - /tags/branch-Code-11-SP1-2_17_10/wagon/
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 15:37:16 2010 New Revision: 60510 URL: http://svn.opensuse.org/viewcvs/yast?rev=60510&view=rev Log: Created tag branch-Code-11-SP1-2_17_10 for wagon Added: tags/branch-Code-11-SP1-2_17_10/wagon/ (props changed) - copied from r60509, branches/SuSE-Code-11-SP1-Branch/wagon/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60509 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 15:35:45 2010 New Revision: 60509 URL: http://svn.opensuse.org/viewcvs/yast?rev=60509&view=rev Log: - Upgrading installed products moved after wagon self-update and restart In some cases the newly added code was not executed (BNC #573084). Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon_migration_products.ycp trunk/wagon/src/clients/wagon_selfupdate.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Mon Jan 25 15:35:45 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz + +- Upgrading installed products moved after wagon self-update and + restart In some cases the newly added code was not executed + (BNC #573084). + +------------------------------------------------------------------- Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz - Wagon extended to read and use migration products from the Modified: trunk/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_migratio… ============================================================================== --- trunk/wagon/src/clients/wagon_migration_products.ycp (original) +++ trunk/wagon/src/clients/wagon_migration_products.ycp Mon Jan 25 15:35:45 2010 @@ -36,6 +36,42 @@ return `back; } + integer UpdateInstalledProducts () { + integer affected_products = 0; + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + // Product is not installed + if (p["status"]:`unknown != `installed) return; + + // Make the logs readable + p["license"] = "..."; + p["description"] = "..."; + + string product_name = p["name"]:""; + string product_version = p["version"]:""; + + if (product_name == nil || product_name == "") { + y2error ("Cannot distinguish product name: %1", product_name); + return; + } + + // Product version is the same but release can be different + // product map doesn't contain the release string. To be sure, product will be reinstalled + y2milestone ("Upgrading product %1 version %2", product_name, product_version); + // The version is the same, release can be different + if (Pkg::ResolvableInstall (product_name, `product) != true) { + Report::Error (sformat(_("Cannot update installed product %1."), product_name)); + return; + } + + affected_products = affected_products + 1; + }); + + return affected_products; + } + boolean FindAndSelectMigrationProducts () { if (Wagon::InitPkg() != true) { Report::Error (_("Unable to initialize the package manager.")); @@ -99,13 +135,39 @@ return true; } + Wagon::InitPkg(); + + Wagon::ReadProductsBeforeMigration(); + Wagon::StoreProductsBeforeMigration(); + + // BNC #573084: New code (upgrading products) can be added after + // wagon self-upgrade and restart + integer products_for_upgrade = UpdateInstalledProducts(); + + if (products_for_upgrade > 0) { + symbol ret = SolveDependencies(); + + if (ret != `abort && ret != `cancel) { + y2milestone ("Upgrading %1 product packages...", products_for_upgrade); + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Product package upgrade returned: %1", inst_ret); + ret = `auto; + } else { + return `abort; + } + + ResetPackager(); + } else { + y2warning ("No products selected for upgrade"); + } + if (FindAndSelectMigrationProducts() != true) { return `auto; } symbol ret = SolveDependencies(); - if (ret != `abort) { + if (ret != `abort && ret != `cancel) { // Solver ends with some resolvables changed if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { y2milestone ("Installing packages..."); Modified: trunk/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_selfupda… ============================================================================== --- trunk/wagon/src/clients/wagon_selfupdate.ycp (original) +++ trunk/wagon/src/clients/wagon_selfupdate.ycp Mon Jan 25 15:35:45 2010 @@ -135,50 +135,8 @@ return pkgs_affected; } - integer UpdateInstalledProducts () { - integer affected_products = 0; - - list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); - - foreach (map<string, any> p, products, { - // Product is not installed - if (p["status"]:`unknown != `installed) return; - - // Make the logs readable - p["license"] = "..."; - p["description"] = "..."; - - string product_name = p["name"]:""; - string product_version = p["version"]:""; - - if (product_name == nil || product_name == "") { - y2error ("Cannot distinguish product name: %1", product_name); - return; - } - - // Product version is the same but release can be different - // product map doesn't contain the release string. To be sure, product will be reinstalled - y2milestone ("Upgrading product %1 version %2", product_name, product_version); - // The version is the same, release can be different - if (Pkg::ResolvableInstall (product_name, `product) != true) { - Report::Error (sformat(_("Cannot update installed product %1."), product_name)); - return; - } - - affected_products = affected_products + 1; - }); - - return affected_products; - } - Wagon::InitPkg(); - list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); - y2milestone ("All known products: %1", products); - - Wagon::ReadProductsBeforeMigration(); - Wagon::StoreProductsBeforeMigration(); - symbol ret = `auto; // Patches need solver run @@ -202,12 +160,6 @@ } } - integer products_selected_for_update = UpdateInstalledProducts(); - if (products_selected_for_update > 0) { - y2milestone ("%1 products were selected for update", products_selected_for_update); - selected = products_selected_for_update; - } - y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60508 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_migration_products.ycp src/clients/wagon_selfupdate.ycp
by locilka＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: locilka Date: Mon Jan 25 15:35:25 2010 New Revision: 60508 URL: http://svn.opensuse.org/viewcvs/yast?rev=60508&view=rev Log: - Upgrading installed products moved after wagon self-update and restart In some cases the newly added code was not executed (BNC #573084). - 2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Mon Jan 25 15:35:25 2010 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Mon Jan 25 15:35:25 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jan 25 11:59:30 CET 2010 - locilka(a)suse.cz + +- Upgrading installed products moved after wagon self-update and + restart In some cases the newly added code was not executed + (BNC #573084). +- 2.17.10 + +------------------------------------------------------------------- Fri Jan 22 11:57:00 CET 2010 - locilka(a)suse.cz - Wagon extended to read and use migration products from the Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_migration_products.ycp Mon Jan 25 15:35:25 2010 @@ -36,6 +36,42 @@ return `back; } + integer UpdateInstalledProducts () { + integer affected_products = 0; + + list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); + + foreach (map<string, any> p, products, { + // Product is not installed + if (p["status"]:`unknown != `installed) return; + + // Make the logs readable + p["license"] = "..."; + p["description"] = "..."; + + string product_name = p["name"]:""; + string product_version = p["version"]:""; + + if (product_name == nil || product_name == "") { + y2error ("Cannot distinguish product name: %1", product_name); + return; + } + + // Product version is the same but release can be different + // product map doesn't contain the release string. To be sure, product will be reinstalled + y2milestone ("Upgrading product %1 version %2", product_name, product_version); + // The version is the same, release can be different + if (Pkg::ResolvableInstall (product_name, `product) != true) { + Report::Error (sformat(_("Cannot update installed product %1."), product_name)); + return; + } + + affected_products = affected_products + 1; + }); + + return affected_products; + } + boolean FindAndSelectMigrationProducts () { if (Wagon::InitPkg() != true) { Report::Error (_("Unable to initialize the package manager.")); @@ -99,13 +135,39 @@ return true; } + Wagon::InitPkg(); + + Wagon::ReadProductsBeforeMigration(); + Wagon::StoreProductsBeforeMigration(); + + // BNC #573084: New code (upgrading products) can be added after + // wagon self-upgrade and restart + integer products_for_upgrade = UpdateInstalledProducts(); + + if (products_for_upgrade > 0) { + symbol ret = SolveDependencies(); + + if (ret != `abort && ret != `cancel) { + y2milestone ("Upgrading %1 product packages...", products_for_upgrade); + any inst_ret = WFM::call ("inst_rpmcopy"); + y2milestone ("Product package upgrade returned: %1", inst_ret); + ret = `auto; + } else { + return `abort; + } + + ResetPackager(); + } else { + y2warning ("No products selected for upgrade"); + } + if (FindAndSelectMigrationProducts() != true) { return `auto; } symbol ret = SolveDependencies(); - if (ret != `abort) { + if (ret != `abort && ret != `cancel) { // Solver ends with some resolvables changed if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { y2milestone ("Installing packages..."); Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_selfupdate.ycp Mon Jan 25 15:35:25 2010 @@ -135,50 +135,8 @@ return pkgs_affected; } - integer UpdateInstalledProducts () { - integer affected_products = 0; - - list <map <string,any> > products = Pkg::ResolvableProperties ("", `product, ""); - - foreach (map<string, any> p, products, { - // Product is not installed - if (p["status"]:`unknown != `installed) return; - - // Make the logs readable - p["license"] = "..."; - p["description"] = "..."; - - string product_name = p["name"]:""; - string product_version = p["version"]:""; - - if (product_name == nil || product_name == "") { - y2error ("Cannot distinguish product name: %1", product_name); - return; - } - - // Product version is the same but release can be different - // product map doesn't contain the release string. To be sure, product will be reinstalled - y2milestone ("Upgrading product %1 version %2", product_name, product_version); - // The version is the same, release can be different - if (Pkg::ResolvableInstall (product_name, `product) != true) { - Report::Error (sformat(_("Cannot update installed product %1."), product_name)); - return; - } - - affected_products = affected_products + 1; - }); - - return affected_products; - } - Wagon::InitPkg(); - list <map <string, any> > products = Pkg::ResolvableProperties ("", `product, ""); - y2milestone ("All known products: %1", products); - - Wagon::ReadProductsBeforeMigration(); - Wagon::StoreProductsBeforeMigration(); - symbol ret = `auto; // Patches need solver run @@ -202,12 +160,6 @@ } } - integer products_selected_for_update = UpdateInstalledProducts(); - if (products_selected_for_update > 0) { - y2milestone ("%1 products were selected for update", products_selected_for_update); - selected = products_selected_for_update; - } - y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60507 - /tags/branch-Code-11-SP1-2_17_89/storage/
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:34:39 2010 New Revision: 60507 URL: http://svn.opensuse.org/viewcvs/yast?rev=60507&view=rev Log: Created tag branch-Code-11-SP1-2_17_89 for storage Added: tags/branch-Code-11-SP1-2_17_89/storage/ (props changed) - copied from r60506, branches/SuSE-Code-11-SP1-Branch/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60506 - /tags/branch-Code-11-SP1-2_17_89/
by aschnell＠svn.opensuse.org 25 Jan '10

25 Jan '10

Author: aschnell Date: Mon Jan 25 14:34:38 2010 New Revision: 60506 URL: http://svn.opensuse.org/viewcvs/yast?rev=60506&view=rev Log: Created tag branch-Code-11-SP1-2_17_89 Added: tags/branch-Code-11-SP1-2_17_89/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0