Author: lslezak Date: Tue Nov 30 16:03:25 2010 New Revision: 62921 URL: http://svn.opensuse.org/viewcvs/yast?rev=62921&view=rev Log: - fixed DownloadInAdvance mode check - it's the default now (bnc#653497) - 2.20.13 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackageSlideShow.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=62921&r1=62920&r2=62921&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Tue Nov 30 16:03:25 2010 @@ -1 +1 @@ -2.20.12 +2.20.13 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=62921&r1=62920&r2=62921&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Nov 30 16:03:25 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 30 14:58:31 UTC 2010 - lslezak@suse.cz + +- fixed DownloadInAdvance mode check - it's the default now + (bnc#653497) +- 2.20.13 + +------------------------------------------------------------------- Fri Nov 12 11:37:16 UTC 2010 - lslezak@suse.cz - display more details when adding a community repository fails Modified: trunk/packager/src/modules/PackageSlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageSlideShow.ycp?rev=62921&r1=62920&r2=62921&view=diff ============================================================================== --- trunk/packager/src/modules/PackageSlideShow.ycp (original) +++ trunk/packager/src/modules/PackageSlideShow.ycp Tue Nov 30 16:03:25 2010 @@ -17,6 +17,7 @@ import "String"; import "Mode"; import "URL"; + import "Installation"; global list<list<integer> > total_sizes_per_cd_per_src = []; // total sizes per inst-src: [ [42, 43, 44], [12, 13, 14] ] global list<list<integer> > remaining_sizes_per_cd_per_src = []; // remaining sizes @@ -510,7 +511,13 @@ total_count_downloaded = 0; integer total_count_to_install = packages_to_install(total_pkg_count_per_cd_per_src); downloading_pct = 100 * total_count_to_download / (total_count_to_install + total_count_to_download); - download_in_advance_mode= (string)SCR::Read(.etc.zypp_conf.value.main."commit.downloadMode") == "DownloadInAdvance"; + + string download_mode = (string)SCR::Read(.etc.zypp_conf.value.main."commit.downloadMode"); + // DownloadInAdvance is default for local (root=/) install since openSUSE-11.4 (bnc#653497) + // (we cannot get the target root from Pkg:: so we have to check the mode instead) + download_in_advance_mode = download_mode == "DownloadInAdvance" || + (download_mode == nil && Mode::normal() && !Installation::dirinstall_installing_into_dir); + init_pkg_data_complete = true; // reset the history log -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org