Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at Wed Nov 10 18:24:39 CET 2010. -------- --- yast2-country/yast2-country.changes 2010-10-19 14:54:07.000000000 +0200 +++ yast2-country/yast2-country.changes 2010-11-10 07:57:31.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Nov 10 07:56:37 CET 2010 - jsuchome@suse.cz + +- fixed broken build +- 2.20.5 + +------------------------------------------------------------------- +Tue Nov 9 15:19:22 CET 2010 - jsuchome@suse.cz + +- call mkinitrd also when hwclock changes (bnc#638128, bnc#638185) +- 2.20.4 + +------------------------------------------------------------------- +Mon Nov 8 14:24:53 UTC 2010 - lslezak@suse.cz + +- don't install recommended packages for already installed packages + when adding a new language (bnc#439373) +- start the package manager when there are unresolved dependencies +- 2.20.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-country-2.20.2.tar.bz2 New: ---- yast2-country-2.20.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.iLqNAA/_old 2010-11-10 18:24:05.000000000 +0100 +++ /var/tmp/diff_new_pack.iLqNAA/_new 2010-11-10 18:24:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.20.2) +# spec file for package yast2-country (Version 2.20.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-country -Version: 2.20.2 +Version: 2.20.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.20.2.tar.bz2 +Source0: yast2-country-2.20.5.tar.bz2 Prefix: /usr @@ -80,7 +80,7 @@ timezone) for yast2. %prep -%setup -n yast2-country-2.20.2 +%setup -n yast2-country-2.20.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-country-2.20.2.tar.bz2 -> yast2-country-2.20.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/VERSION new/yast2-country-2.20.5/VERSION --- old/yast2-country-2.20.2/VERSION 2010-10-19 14:42:10.000000000 +0200 +++ new/yast2-country-2.20.5/VERSION 2010-11-10 07:56:51.000000000 +0100 @@ -1 +1 @@ -2.20.2 +2.20.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/language/src/language.ycp new/yast2-country-2.20.5/language/src/language.ycp --- old/yast2-country-2.20.2/language/src/language.ycp 2010-04-15 07:21:15.000000000 +0200 +++ new/yast2-country-2.20.5/language/src/language.ycp 2010-11-08 20:04:17.000000000 +0100 @@ -7,7 +7,7 @@ * * Purpose: client for language configuration in running system * - * $Id: language.ycp 58858 2009-10-01 06:23:49Z jsuchome $ + * $Id: language.ycp 62766 2010-11-08 16:09:36Z lslezak $ */ { @@ -74,16 +74,20 @@ Progress::NextStage (); boolean enough_space = true; + boolean solved = true; if (Language::PackagesModified () && !no_packages) { if (Mode::commandline ()) { // if not commandline, packages were already initialized in // select_language - enough_space = Language::PackagesInit ( + solved = Language::PackagesInit ( splitstring (Language::languages, ",")); + enough_space = Language::EnoughSpace(); + + y2milestone("Packages solved: %1, enough space; %2", solved, enough_space); } - if (enough_space) + if (enough_space && solved) { Language::PackagesCommit (); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/language/src/modules/Language.ycp new/yast2-country-2.20.5/language/src/modules/Language.ycp --- old/yast2-country-2.20.2/language/src/modules/Language.ycp 2010-10-12 15:26:55.000000000 +0200 +++ new/yast2-country-2.20.5/language/src/modules/Language.ycp 2010-11-08 20:04:17.000000000 +0100 @@ -6,7 +6,7 @@ * Thomas Roelz <tom@suse.de> * Maintainer: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: Language.ycp 60270 2010-01-07 14:09:34Z jsuchome $ + * $Id: Language.ycp 62766 2010-11-08 16:09:36Z lslezak $ */ { @@ -889,20 +889,68 @@ y2milestone ("Saved data for language: <%1>", loc); } +boolean reset_recommended = true; + +// unselect all selected packages (bnc#439373) +// +// this is a workaround for installing recommened packages for already +// installed packages - we cannot simply set the solver flag +// as the laguage packages are also recommended, this would cause that +// no language package would be installed +// +// do this just once at the beginning +void ResetRecommendedPackaged() +{ + if (!reset_recommended) + { + return; + } + + Pkg::PkgSolve(true); + + list<map> selected_packages = Pkg::ResolvableProperties("", `package, ""); + + y2milestone("Unselecting already recommended packages"); + + // unselect them + foreach(map package, selected_packages, + { + if (package["status"]:`unknown == `selected) + { + y2milestone("Unselecting package: %1", package["name"]:""); + Pkg::PkgNeutral(package["name"]:""); + } + } + ); + + reset_recommended = false; +} + /** * Initializes source and target, * computes the packages necessary to install and uninstall, - * checks for disk space (#50745) - * @return false when there is not enough disk space for new packages + * @return false if the solver failed (unresolved dependencies) */ global define boolean PackagesInit (list<string> selected_languages) { PackageSystem::EnsureSourceInit (); PackageSystem::EnsureTargetInit (); + ResetRecommendedPackaged(); + Pkg::SetAdditionalLocales (selected_languages); - Pkg::PkgSolve (true); + boolean solved = Pkg::PkgSolve (true); + + return solved; +} + +/* + * checks for disk space (#50745) + * @return false when there is not enough disk space for new packages + */ +global define boolean EnoughSpace() +{ boolean ok = true; foreach (string mountpoint, list<integer> usage, Pkg::TargetGetDU (), { if (usage[2]:0 > usage[0]:0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/language/src/select_language.ycp new/yast2-country-2.20.5/language/src/select_language.ycp --- old/yast2-country-2.20.2/language/src/select_language.ycp 2010-10-12 15:28:43.000000000 +0200 +++ new/yast2-country-2.20.5/language/src/select_language.ycp 2010-11-08 20:04:17.000000000 +0100 @@ -15,7 +15,7 @@ * Summary: * This client shows main dialog for choosing the language. * - * $Id: select_language.ycp 62605 2010-10-12 13:28:43Z jsuchome $ + * $Id: select_language.ycp 62766 2010-11-08 16:09:36Z lslezak $ * */ { @@ -35,6 +35,7 @@ import "Stage"; import "Timezone"; import "Wizard"; + import "PackagesUI"; string language = Language::language; @@ -619,7 +620,22 @@ } else if (Language::PackagesModified () && !Mode::config ()) { - if (!Language::PackagesInit (selected_languages)) + if (!Language::PackagesInit(selected_languages)) + { + // error message - package solver failed + Report::Error (_("There are unresolved package dependencies.")); + + // run the package selector + + // disable repomanagement during installation + boolean repomgmt = !Mode::installation(); + // start the package selector + PackagesUI::RunPackageSelector($[ "enable_repo_mgr" : repomgmt, "mode" : `summaryMode ]); + + ret = `not_next; + continue; + } + if (!Language::EnoughSpace()) { // error message Report::Error (_("There is not enough space to install all additional packages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/timezone/data/timezone_raw.ycp new/yast2-country-2.20.5/timezone/data/timezone_raw.ycp --- old/yast2-country-2.20.2/timezone/data/timezone_raw.ycp 2010-10-19 14:40:58.000000000 +0200 +++ new/yast2-country-2.20.5/timezone/data/timezone_raw.ycp 2010-10-19 14:42:36.000000000 +0200 @@ -3,7 +3,7 @@ * Authors: Thomas Roelz <tom@suse.de> * Summary: The untranslated timezone database. * - * $Id: timezone_raw.ycp 47033 2008-04-24 12:20:48Z jsuchome $ + * $Id: timezone_raw.ycp 62652 2010-10-19 12:42:35Z jsuchome $ * * ***************************************************************** * In case of changes please keep the following files in sync: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/timezone/src/Timezone.ycp new/yast2-country-2.20.5/timezone/src/Timezone.ycp --- old/yast2-country-2.20.2/timezone/src/Timezone.ycp 2010-08-17 10:15:22.000000000 +0200 +++ new/yast2-country-2.20.5/timezone/src/Timezone.ycp 2010-11-10 07:55:58.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <kkaempf@suse.de> * Thomas Roelz <tom@suse.de> * - * $Id: Timezone.ycp 62382 2010-08-17 08:15:21Z jsuchome $ + * $Id: Timezone.ycp 62785 2010-11-09 14:48:32Z jsuchome $ */ { @@ -59,6 +59,8 @@ */ global boolean windows_partition = false; +// if mkinitrd should be called at the end +global boolean call_mkinitrd = false; // translation of correct timezone to the one that could be shown in map widget global map <string,string> yast2zonetab = $[ @@ -754,6 +756,11 @@ y2milestone( "Save Saved data for timezone: <%1>", timezone ); + if (call_mkinitrd && !Stage::initial ()) + { + CallMkinitrd (); + } + return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.20.2/timezone/src/dialogs.ycp new/yast2-country-2.20.5/timezone/src/dialogs.ycp --- old/yast2-country-2.20.2/timezone/src/dialogs.ycp 2010-08-17 10:15:22.000000000 +0200 +++ new/yast2-country-2.20.5/timezone/src/dialogs.ycp 2010-11-09 15:48:32.000000000 +0100 @@ -11,7 +11,7 @@ * Summary: * Dialogs for timeone and time configuration. * - * $Id: dialogs.ycp 62382 2010-08-17 08:15:21Z jsuchome $ + * $Id: dialogs.ycp 62785 2010-11-09 14:48:32Z jsuchome $ */ { textdomain "country"; @@ -392,10 +392,7 @@ if (Timezone::hwclock == "--localtime" && !Stage::initial ()) { - // busy message - Popup::ShowFeedback ("", _("Updating initrd...")); - Timezone::CallMkinitrd (); - Popup::ClearFeedback (); + Timezone::call_mkinitrd = true; } } } @@ -439,6 +436,7 @@ boolean changed_time = false; string timezone = Timezone::timezone; string timezone_old = timezone; + string timezone_initial = timezone; string hwclock = Timezone::hwclock; y2milestone ( "timezone_old %1", timezone_old ); @@ -875,6 +873,12 @@ Timezone::user_decision = true; Timezone::user_hwclock = true; Timezone::ntp_used = ntp_used; + // See bnc#638185c5: refresh_initrd should be called if HWCLOCK is changed (--localtime <-> --utc) and/or + // if --localtime is set and TIMEZONE will be changed. + if (hwclock_s != hwclock_s_initial || (hwclock_s == `hwclock_localtime && timezone != timezone_initial)) + { + Timezone::call_mkinitrd = true; + } if (ntp_used && ntp_server != "") { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org