Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Mon Aug 15 10:14:43 CEST 2011.
-------- --- yast2-installation/yast2-installation.changes 2011-08-03 10:58:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2011-08-12 14:02:17.000000000 +0200 @@ -1,0 +2,49 @@ +Fri Aug 12 13:58:01 CEST 2011 - [email protected] + +- expect there might me extra checks for disk controllers with + s390 (bnc#706911) +- adapted help text and label in installation mode selection + (bnc#711160) +- 2.21.14 + +------------------------------------------------------------------- +Fri Aug 5 12:13:13 UTC 2011 - [email protected] + +- upgrade_urls.ycp - do not display reading and writing progress, + it is pretty quick and just causes screen flickering + (the write progress is displayed only when there is an enabled + repo to add, refreshing it can take long time) (bnc#692614) +- 2.21.13 + +------------------------------------------------------------------- +Fri Aug 5 12:32:16 CEST 2011 - [email protected] + +- fixed .desktop file (bnc #681249) + +------------------------------------------------------------------- +Thu Aug 4 14:50:33 UTC 2011 - [email protected] + +- 2.21.12 + +------------------------------------------------------------------- +Thu Aug 4 14:07:38 CEST 2011 - [email protected] + +- Copy network interface naming rules early to get them to initrd (bnc#666079). + +------------------------------------------------------------------- +Thu Aug 4 11:37:02 UTC 2011 - [email protected] + +- extraurls: check whether there is an update candidate in the + added extra repositories - openSUSE DVD does not contain all + packages, packages from OSS repository which are not on DVD + medium were not upgraded and were left in the old version even + after adding new OSS repository with updated version (bnc#693230) + +------------------------------------------------------------------- +Wed Aug 3 13:19:50 UTC 2011 - [email protected] + +- cleanup: removed obsoleted SourceManager::SyncAddedAndDeleted() + call (zmd sync has been removed) +- 2.21.11 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.21.10.tar.bz2 New: ---- yast2-installation-2.21.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.Mlx1ed/_old 2011-08-15 10:12:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Mlx1ed/_new 2011-08-15 10:12:05.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-installation -Version: 2.21.10 +Version: 2.21.14 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.21.10.tar.bz2 +Source0: yast2-installation-2.21.14.tar.bz2 Prefix: /usr @@ -43,8 +43,8 @@ # PackageCallbacks::RegisterEmptyProgressCallbacks() BuildRequires: yast2 >= 2.16.52 -# Pkg::SourceProvideDigestedFile() -BuildRequires: yast2-pkg-bindings >= 2.17.25 +# Pkg::Add/RemoveUpgradeRepo() +BuildRequires: yast2-pkg-bindings >= 2.21.2 # Unified progress bar (done by visnov) BuildRequires: yast2-packager >= 2.17.9 @@ -62,6 +62,9 @@ # Pkg::SourceProvideDigestedFile() Conflicts: yast2-pkg-bindings < 2.17.25 +# Pkg::Add/RemoveUpgradeRepo() +Requires: yast2-pkg-bindings >= 2.21.2 + # Mouse-related scripts moved to yast2-mouse Conflicts: yast2-mouse < 2.18.0 @@ -136,7 +139,7 @@ System installation code as present on installation media. %prep -%setup -n yast2-installation-2.21.10 +%setup -n yast2-installation-2.21.14 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-installation-2.21.10.tar.bz2 -> yast2-installation-2.21.14.tar.bz2 ++++++ ++++ 15236 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.10/VERSION new/yast2-installation-2.21.14/VERSION --- old/yast2-installation-2.21.10/VERSION 2011-08-03 10:53:49.000000000 +0200 +++ new/yast2-installation-2.21.14/VERSION 2011-08-12 13:58:29.000000000 +0200 @@ -1 +1 @@ -2.21.10 +2.21.14 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.10/configure.in new/yast2-installation-2.21.14/configure.in --- old/yast2-installation-2.21.10/configure.in 2011-08-03 10:57:41.000000000 +0200 +++ new/yast2-installation-2.21.14/configure.in 2011-06-23 15:57:11.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.21.10, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.21.5, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.10" +VERSION="2.21.5" RPMNAME="yast2-installation" MAINTAINER="Jiří Suchomel <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.10/src/clients/inst_extrasources.ycp new/yast2-installation-2.21.14/src/clients/inst_extrasources.ycp --- old/yast2-installation-2.21.10/src/clients/inst_extrasources.ycp 2009-04-29 12:58:11.000000000 +0200 +++ new/yast2-installation-2.21.14/src/clients/inst_extrasources.ycp 2011-08-05 08:04:24.000000000 +0200 @@ -9,7 +9,7 @@ * Adds all sources defined in control file (software->extra_urls) * and stores them at the end. * - * $Id: inst_extrasources.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: inst_extrasources.ycp 65201 2011-08-04 11:55:27Z lslezak $ */ { @@ -25,6 +25,9 @@ import "ProductControl"; import "Installation"; import "PackageCallbacks"; +import "NetworkService"; +import "PackagesUI"; +import "Popup"; /** * Returns list of maps of repositories to register. See bnc #381360. @@ -150,6 +153,87 @@ return (Pkg::TargetInit (Installation::destdir, false) == true); } +// refresh the requested repositories +// returns true on success +boolean RefreshRepositories(list<integer> repos) +{ + boolean ret = true; + + y2milestone("Refreshing repositories %1", repos); + foreach(integer repo, repos, { + ret = ret && Pkg::SourceRefreshNow(repo); + }); + + y2milestone("Refresh succeeded: %1", ret); + + return ret; +} + +// is the repository an update repo? +boolean IsUpdateRepo(integer repo) +{ + y2milestone("Checking whether repository %1 is an update repo...", repo); + boolean ret = false; + + // check if there is a patch available in the repository + foreach (map patch, Pkg::ResolvableProperties ("", `patch, ""), { + if (patch["source"]:-1 == repo) + { + y2milestone("Found patch %1 in the repository", patch["name"]:""); + ret = true; + break; + } + }); + + y2milestone("Repository %1 is update repo: %2", repo, ret); + + return ret; +} + +// mark the repositories for upgrade, run the solver +void UpgradeFrom(list<integer> repos) +{ + foreach(integer repo, repos, { + y2milestone("Adding upgrade repo %1", repo); + Pkg::AddUpgradeRepo(repo); + }); + + Pkg::PkgSolve(true); +} + +// revert the upgrading repos, reset package selection +void RevertUpgradeFrom(list<integer> repos) +{ + foreach(integer repo, repos, { + y2milestone("Removing upgrade repo %1", repo); + Pkg::RemoveUpgradeRepo(repo); + }); + + Pkg::PkgApplReset(); + Pkg::PkgReset(); +} + +// check if there is a selected package in the requested repositories +// returns number of available updates +integer UpgradesAvailable(list<integer> repos) +{ + integer ret = 0; + + foreach (map pkg, Pkg::ResolvableProperties ("", `package, ""), { + integer source = pkg["source"]:-1; + if (pkg["status"]:`none == `selected && contains(repos, source)) + { + string package = sformat("%1-%2.%3", pkg["name"]:"", pkg["version"]:"", pkg["arch"]:""); + y2milestone("Found upgrade to install: %1", package); + + ret = ret + 1; + } + }); + + y2milestone("Available upgrades: %1", ret); + + return ret; +} ////////////////////////////////////////// @@ -182,15 +266,82 @@ // synchronize the sources if any source has been added if (size (added_ids) > 0) { - y2milestone ("syncing to zmd"); - boolean synced = SourceManager::SyncAddedAndDeleted (added_ids, []); - y2milestone ("sync status: %1", synced); - // If any source has been added, store the sources // bnc #440184 y2milestone ("Some (%1) sources have been added, storing them...", added_ids); Pkg::SourceSaveAll(); } + + // check during upgrade whether the added repositories provide an upgrade for installed package + // (openSUSE DVD does not contain all packages, packages from OSS repository might not have been upgraded, + // see bnc#693230 for details) + if (Mode::update() && size(added_ids) > 0 ) + { + y2milestone("Checking whether there is and update provided by extra (non-update) repo..."); + + // network up? + if (NetworkService::isNetworkRunning()) + { + // refresh the added repositories and load them + if (RefreshRepositories(added_ids) && Pkg::SourceStartManager(true)) + { + // ignore update repositories - the updates will be installed later by online update + list<integer> check_repos = filter(integer repo, added_ids, {return !IsUpdateRepo(repo);}); + + if (size(check_repos) > 0) + { + UpgradeFrom(check_repos); + + integer upgrades_avail = UpgradesAvailable(check_repos); + + if (upgrades_avail > 0) + { + // popup message, list of repositores is appended to the text + string message = _("Package updates have been detected in these additional repositories:\n"); + foreach(integer repo, check_repos, { + map repo_info = Pkg::SourceGeneralData(repo); + message = message + sformat("%1 (%2)\n", repo_info["name"]:"", repo_info["url"]:""); + }); + + // yes/no popup question + message = message + "\n" + _("Start the software manager to check and install the updates?"); + + if (Popup::YesNo(message)) + { + // start the software manager + symbol ui = PackagesUI::RunPackageSelector($["mode" : `summaryMode]); + y2milestone("Package manager returned: %1", ui); + + if (ui == `accept) + { + // install the packages + y2milestone("Installing packages"); + WFM::call("inst_rpmcopy"); + } + } + else + { + y2milestone("Skipping installation of the available updates"); + } + } + else + { + y2milestone("Everything OK, no available update found"); + } + + RevertUpgradeFrom(check_repos); + } + } + else + { + y2warning("Could not load new repositories"); + } + } + else + { + y2milestone("Network is not running, skipping available updates check"); + } + } } return `auto; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.10/src/clients/inst_mode.ycp new/yast2-installation-2.21.14/src/clients/inst_mode.ycp --- old/yast2-installation-2.21.10/src/clients/inst_mode.ycp 2010-06-29 15:16:10.000000000 +0200 +++ new/yast2-installation-2.21.14/src/clients/inst_mode.ycp 2011-08-12 13:57:48.000000000 +0200 @@ -130,9 +130,9 @@ !Mode::update () ), `VSpacing( 0.3 ), - // radio button CreateRadioButtonTerm ( - _("&Update"), + // radio button + _("&Update an Existing System"), `update, Directory::themedir + "/current/icons/48x48/apps/yast-update.png", Mode::update () @@ -204,7 +204,7 @@ <b>Include Add-On Products from Separate Media</b>.</p>") + // help text for installation method - _("<p> + (InstData::enable_autoconfiguration == true ? _("<p> Select <b>Use Automatic Configuration</b> to let the installation program configure your network and hardware automatically. Otherwise you will be offered a configuration proposal with the possibility to tune all the @@ -213,7 +213,7 @@ ") + // help text for installation method - _("<p>Update mode does not support automatic configuration.</p>") + + _("<p>Update mode does not support automatic configuration.</p>") : "") + // help text for installation method _("<p>The feature <b>Update</b> is only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.10/src/clients/inst_system_analysis.ycp new/yast2-installation-2.21.14/src/clients/inst_system_analysis.ycp --- old/yast2-installation-2.21.10/src/clients/inst_system_analysis.ycp 2011-08-03 10:55:27.000000000 +0200 +++ new/yast2-installation-2.21.14/src/clients/inst_system_analysis.ycp 2011-08-12 13:57:37.000000000 +0200 @@ -110,7 +110,7 @@ map targetMap = StorageDevices::Probe (true); if (size (targetMap) == 0) { - if (found_controllers) { + if (found_controllers || Arch::s390 ()) { if( !(Mode::autoinst() || Mode::autoupgrade())) { // pop-up error report Report::Error(_("No hard disks were found for the installation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.10/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.21.14/src/clients/inst_upgrade_urls.ycp --- old/yast2-installation-2.21.10/src/clients/inst_upgrade_urls.ycp 2011-08-03 10:42:18.000000000 +0200 +++ new/yast2-installation-2.21.14/src/clients/inst_upgrade_urls.ycp 2011-08-05 15:41:02.000000000 +0200 @@ -1011,6 +1011,13 @@ return (one_source != sformat ("ID: %1", do_not_remove)); }); + boolean progress = Progress::status(); + + if (size(sources_to_add) == 0) + { + Progress::set(false); + } + SetAddRemoveSourcesProgress (sources_to_remove, sources_to_add, sources_to_add_disabled); PackageCallbacks::RegisterEmptyProgressCallbacks(); @@ -1027,35 +1034,17 @@ PackageCallbacks::RestorePreviousProgressCallbacks(); - return `next; - } + if (size(sources_to_add) == 0) + { + Progress::set(progress); + } - void SetProgressUI () { - Progress::New ( - // TRANSLATORS: dialog caption - _("Reading Repositories Used on the System"), - " ", - 2, - [ - // TRANSLATORS: progress step - _("Read previously used repositories"), - _("Initialize software manager"), - ], - [ - // TRANSLATORS: progress step - _("Reading previously used repositories..."), - _("Initializing software manager..."), - ], - // TRANSLATORS: dialog help - _("<p>Reading repositories. Please wait...</p>") - ); - Wizard::SetTitleIcon ("yast-sw_source"); + return `next; } // for testing purpose if (Mode::normal()) Wizard::CreateDialog(); - SetProgressUI(); Progress::NextStage(); // Read the old repos (old type) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.10/src/config/deploy_image.desktop new/yast2-installation-2.21.14/src/config/deploy_image.desktop --- old/yast2-installation-2.21.10/src/config/deploy_image.desktop 2011-07-25 11:29:38.000000000 +0200 +++ new/yast2-installation-2.21.14/src/config/deploy_image.desktop 2011-08-05 15:41:02.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=false X-KDE-Library=yast2 X-SuSE-YaST-Call=deploy_image diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.21.10/src/inst_finish/copy_files_finish.ycp new/yast2-installation-2.21.14/src/inst_finish/copy_files_finish.ycp --- old/yast2-installation-2.21.10/src/inst_finish/copy_files_finish.ycp 2011-06-22 17:09:35.000000000 +0200 +++ new/yast2-installation-2.21.14/src/inst_finish/copy_files_finish.ycp 2011-08-05 08:04:24.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <[email protected]> * - * $Id: copy_files_finish.ycp 64383 2011-06-15 09:38:48Z jsuchome $ + * $Id: copy_files_finish.ycp 65209 2011-08-04 12:32:37Z mvidner $ * */ @@ -94,7 +94,8 @@ } // udev files that should be copied - list <string> files_to_copy = [ "70-persistent-cd.rules" ]; + // Copy network rules early to get them to initrd, bnc#666079 + list <string> files_to_copy = [ "70-persistent-cd.rules", "70-persistent-net.rules" ]; foreach (string one_file, files_to_copy, { string one_file_from = sformat ("%1%2", udev_rules_srcdir, one_file); @@ -111,6 +112,9 @@ if (cmd_out["exit"]:-1 != 0) { y2error ("Command failed '%1': %2", cmd, cmd_out); } + else { + y2milestone ("Copied to %1", one_file_to); + } } }); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
