Author: locilka Date: Wed Sep 5 14:47:20 2007 New Revision: 40769 URL: http://svn.opensuse.org/viewcvs/yast?rev=40769&view=rev Log: - Skipping Add-Ons when requested by user (#305554). - Adjusted RPM dependencies. Modified: trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/inst_add-on.ycp trunk/add-on/src/misc.ycp trunk/add-on/yast2-add-on.spec.in Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=40769&r1=40768&r2=40769&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Wed Sep 5 14:47:20 2007 @@ -3,6 +3,8 @@ - NotEnoughMemory-functions moved to a separate misc.ycp include file to make them possible to be used from packager (#305554). +- Skipping Add-Ons when requested by user (#305554). +- Adjusted RPM dependencies. - 2.15.15 ------------------------------------------------------------------- Modified: trunk/add-on/src/inst_add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/inst_add-on.ycp?rev=40769&r1=40768&r2=40769&view=diff ============================================================================== --- trunk/add-on/src/inst_add-on.ycp (original) +++ trunk/add-on/src/inst_add-on.ycp Wed Sep 5 14:47:20 2007 @@ -21,6 +21,11 @@ include "add-on/add-on-workflow.ycp"; +if (AddOnProduct::skip_add_ons) { + y2milestone ("Skipping add-ons (as requested before)"); + return `auto; +} + map argmap = GetInstArgs::argmap(); Packages::SelectProduct (); Modified: trunk/add-on/src/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/misc.ycp?rev=40769&r1=40768&r2=40769&view=diff ============================================================================== --- trunk/add-on/src/misc.ycp (original) +++ trunk/add-on/src/misc.ycp Wed Sep 5 14:47:20 2007 @@ -71,6 +71,7 @@ Do you want to skip using add-on products?") )) { y2milestone ("User decided to skip Add-Ons"); + AddOnProduct::skip_add_ons = true; return false; } else { Modified: trunk/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/yast2-add-on.spec.in?rev=40769&r1=40768&r2=40769&view=diff ============================================================================== --- trunk/add-on/yast2-add-on.spec.in (original) +++ trunk/add-on/yast2-add-on.spec.in Wed Sep 5 14:47:20 2007 @@ -6,8 +6,9 @@ Requires: yast2 >= 2.15.22 Requires: yast2-installation Requires: yast2-country -# AddOnProduct::low_memory_already_reported -Requires: yast2-packager >= 2.15.27 + +# AddOnProduct::skip_add_ons +Requires: yast2-packager >= 2.15.75 Requires: yast2-storage BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-installation yast2-packager yast2-storage -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org