commit yast2-packager for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Tue Nov 30 18:44:10 CET 2010. -------- --- yast2-packager/yast2-packager.changes 2010-11-12 15:17:10.000000000 +0100 +++ yast2-packager/yast2-packager.changes 2010-11-30 16:03:55.000000000 +0100 @@ -1,0 +2,7 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.20.12.tar.bz2 New: ---- yast2-packager-2.20.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.Ny4C1w/_old 2010-11-30 18:43:40.000000000 +0100 +++ /var/tmp/diff_new_pack.Ny4C1w/_new 2010-11-30 18:43:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.20.12) +# spec file for package yast2-packager (Version 2.20.13) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-packager -Version: 2.20.12 +Version: 2.20.13 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.20.12.tar.bz2 +Source0: yast2-packager-2.20.13.tar.bz2 Prefix: /usr @@ -100,7 +100,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.20.12 +%setup -n yast2-packager-2.20.13 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.20.12.tar.bz2 -> yast2-packager-2.20.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.12/VERSION new/yast2-packager-2.20.13/VERSION --- old/yast2-packager-2.20.12/VERSION 2010-11-12 15:07:04.000000000 +0100 +++ new/yast2-packager-2.20.13/VERSION 2010-11-30 16:01:36.000000000 +0100 @@ -1 +1 @@ -2.20.12 +2.20.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.12/src/modules/PackageSlideShow.ycp new/yast2-packager-2.20.13/src/modules/PackageSlideShow.ycp --- old/yast2-packager-2.20.12/src/modules/PackageSlideShow.ycp 2010-11-10 18:47:54.000000000 +0100 +++ new/yast2-packager-2.20.13/src/modules/PackageSlideShow.ycp 2010-11-30 16:00:34.000000000 +0100 @@ -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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de