Author: jsrain
Date: Mon Jul 20 16:56:11 2009
New Revision: 58119
URL: http://svn.opensuse.org/viewcvs/yast?rev=58119&view=rev
Log:
removed circular dependency on yast2-packager
Modified:
trunk/country/VERSION
trunk/country/language/src/modules/Language.ycp
trunk/country/package/yast2-country.changes
trunk/country/yast2-country.spec.in
Modified: trunk/country/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=58119&r1=58118&r2=58119&view=diff
==============================================================================
--- trunk/country/VERSION (original)
+++ trunk/country/VERSION Mon Jul 20 16:56:11 2009
@@ -1 +1 @@
-2.18.12
+2.18.13
Modified: trunk/country/language/src/modules/Language.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/modules/Language.ycp?rev=58119&r1=58118&r2=58119&view=diff
==============================================================================
--- trunk/country/language/src/modules/Language.ycp (original)
+++ trunk/country/language/src/modules/Language.ycp Mon Jul 20 16:56:11 2009
@@ -24,7 +24,6 @@
import "Misc";
import "Mode";
import "PackageCallbacks";
-import "PackageSlideShow";
import "PackageSystem";
import "Popup";
import "ProductFeatures";
@@ -922,11 +921,21 @@
if (!Mode::commandline ())
{
- PackageSlideShow::InitPkgData (false);
+/* work-around for following in order not to depend on yast2-packager
+ PackageSlideShow::InitPkgData (false);
+ "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes
+*/
+ list total_sizes_per_cd_per_src = Pkg::PkgMediaSizes();
+ integer total_size_to_install = 0;
+ foreach (integer item, flatten (total_sizes_per_cd_per_src), {
+ if (item != -1)
+ total_size_to_install = total_size_to_install + item;
+ });
+
SlideShow::Setup([$[
"name" : "packages",
"description" : _("Installing Packages..."),
- "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes
+ "value" : total_size_to_install / 1024 , // kilobytes
"units" : `kb,
]]);
Modified: trunk/country/package/yast2-country.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=58119&r1=58118&r2=58119&view=diff
==============================================================================
--- trunk/country/package/yast2-country.changes (original)
+++ trunk/country/package/yast2-country.changes Mon Jul 20 16:56:11 2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Jul 20 16:51:26 CEST 2009 - jsrain@suse.cz
+
+- removed the circular build dependency on yast2-packager
+- 2.18.13
+
+-------------------------------------------------------------------
Fri Jul 17 13:47:26 CEST 2009 - jsuchome@suse.cz
- yast2-packager required for PackageSlideShow.ycp
Modified: trunk/country/yast2-country.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/yast2-country.spec.in?rev=58119&r1=58118&r2=58119&view=diff
==============================================================================
--- trunk/country/yast2-country.spec.in (original)
+++ trunk/country/yast2-country.spec.in Mon Jul 20 16:56:11 2009
@@ -6,7 +6,7 @@
#policy files for YaPI dbus interface
Source1: org.opensuse.yast.modules.yapi.time.policy
Source2: org.opensuse.yast.modules.yapi.language.policy
-BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2 yast2-perl-bindings yast2-packager
+BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2 yast2-perl-bindings
Requires: yast2-trans-stats yast2-perl-bindings timezone yast2-packager
# XVersion.ycp
Requires: yast2 >= 2.13.70
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
