[yast-commit] r41844 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/inst_rpmcopy.ycp yast2-packager.spec.in

Author: locilka Date: Wed Nov 7 13:49:53 2007 New Revision: 41844 URL: http://svn.opensuse.org/viewcvs/yast?rev=41844&view=rev Log: - AutoinstSoftware::post_packages moved to AutoinstData::post_packages to break cyclic dependencies. - 2.16.4 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_rpmcopy.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=41844&r1=41843&r2=41844&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Nov 7 13:49:53 2007 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=41844&r1=41843&r2=41844&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Nov 7 13:49:53 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 7 12:48:52 CET 2007 - locilka@suse.cz + +- AutoinstSoftware::post_packages moved to + AutoinstData::post_packages to break cyclic dependencies. +- 2.16.4 + +------------------------------------------------------------------- Mon Nov 5 11:23:33 CET 2007 - locilka@suse.cz - Part of the package content has been moved to a new package Modified: trunk/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_rpmcopy.ycp?rev=41844&r1=41843&r2=41844&view=diff ============================================================================== --- trunk/packager/src/clients/inst_rpmcopy.ycp (original) +++ trunk/packager/src/clients/inst_rpmcopy.ycp Wed Nov 7 13:49:53 2007 @@ -28,7 +28,6 @@ import "Packages"; import "SlideShow"; import "SlideShowCallbacks"; - import "AutoinstSoftware"; import "Popup"; import "Report"; import "Kernel"; @@ -37,6 +36,7 @@ import "Linuxrc"; import "String"; import "FileUtils"; + import "AutoinstData"; include "packager/storage_include.ycp"; @@ -688,10 +688,8 @@ } void AutoinstPostPackages () { - import "AutoinstSoftware"; - // post packages from autoinstall - map res = Pkg::DoProvide (AutoinstSoftware::post_packages); + map res = Pkg::DoProvide (AutoinstData::post_packages); if (size (res) > 0) { foreach (string s, any a, res, ``{ @@ -815,7 +813,7 @@ // ZYPP should solve what it needs and when. // Leaving it here as the backward compatibility if someone decides to change it back. - } else if (Mode::autoinst () && Stage::cont () && size( AutoinstSoftware::post_packages ) > 0) { + } else if (Mode::autoinst () && Stage::cont () && size( AutoinstData::post_packages ) > 0) { // one more compatibility feature to old YaST, post-packages // Simply install a list of package after initial installation (only // makes sense with nfs installatons) Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=41844&r1=41843&r2=41844&view=diff ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Wed Nov 7 13:49:53 2007 @@ -6,7 +6,8 @@ # Installation::installedVersion && Installation::updateVersion # Update::* moved to Installation::update_* -BuildRequires: yast2 >= 2.16.5 +# AutoinstData +BuildRequires: yast2 >= 2.16.8 # Module: OneClickInstallStandard Requires: perl-XML-Bare yast2-perl-bindings @@ -18,7 +19,8 @@ Requires: yast2-pkg-bindings >= 2.15.38 # FileUtils::MD5sum -Requires: yast2 >= 2.16.2 +# AutoinstData +Requires: yast2 >= 2.16.8 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org