[yast-commit] r61083 - in /trunk/autoinstallation: package/autoyast2.changes src/clients/ayast_setup.ycp
Author: ug Date: Tue Mar 2 10:11:08 2010 New Revision: 61083 URL: http://svn.opensuse.org/viewcvs/yast?rev=61083&view=rev Log: don't install post-packages with ayast_setup twice Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/ayast_setup.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=61083&r1=61082&r2=61083&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Mar 2 10:11:08 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 2 09:55:14 CET 2010 - ug@suse.de + +- don't install post-packages with ayast_setup twice + +------------------------------------------------------------------- Fri Feb 26 12:26:37 CET 2010 - ug@suse.de - script docu fixed Modified: trunk/autoinstallation/src/clients/ayast_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ayast_setup.ycp?rev=61083&r1=61082&r2=61083&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/ayast_setup.ycp (original) +++ trunk/autoinstallation/src/clients/ayast_setup.ycp Tue Mar 2 10:11:08 2010 @@ -36,6 +36,8 @@ import "Stage"; import "AutoInstall"; import "AutoinstSoftware"; + import "PackageSystem"; + import "AutoinstData"; boolean dopackages = true; @@ -52,7 +54,13 @@ Mode::SetMode("autoinstallation"); Stage::Set ("continue"); WFM::CallFunction("inst_autopost", []); - AutoinstSoftware::addPostPackages(Profile::current["software","post-packages"]:[]); + list<string> postPackages = Profile::current["software","post-packages"]:[]; + postPackages = filter( string p, postPackages, { + return !PackageSystem::Installed(p); + }); + AutoinstSoftware::addPostPackages(postPackages); + + AutoinstData::post_patterns = Profile::current["software","post-patterns"]:[]; // the following is needed since 10.3 // otherwise the already configured network gets removed -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ug@svn.opensuse.org