Author: jsuchome Date: Tue Nov 6 14:01:12 2007 New Revision: 41817 URL: http://svn.opensuse.org/viewcvs/yast?rev=41817&view=rev Log: - remove unsupported source types also for product-creator-> kiwi workflow (#339110) - 2.13.22 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION?rev=41817&r1=41816&r2=41817&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Tue Nov 6 14:01:12 2007 @@ -1 +1 @@ -2.13.21 +2.13.22 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes?rev=41817&r1=41816&r2=41817&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Tue Nov 6 14:01:12 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 6 13:09:09 CET 2007 - jsuchome@suse.cz + +- remove unsupported source types also for product-creator-> kiwi + workflow (#339110) +- 2.13.22 + +------------------------------------------------------------------- Mon Nov 5 21:56:21 CET 2007 - jsuchome@suse.cz - do not allow source types not supported by kiwi (#339110) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp?rev=41817&r1=41816&r2=41817&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Tue Nov 6 14:01:12 2007 @@ -1926,7 +1926,7 @@ if (failed_repositories != []) { // continue/cancel popup %1 is a \n separated list - if (!Popup::ContinueCancel (sformat (_("Failed to add these repositories: + if (!Popup::ContinueCancel (sformat (_("Failed to add these installation sources: %1. Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp?rev=41817&r1=41816&r2=41817&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Tue Nov 6 14:01:12 2007 @@ -17,6 +17,7 @@ import "Package"; import "PackageCallbacksInit"; import "Sequencer"; +import "URL"; include "product-creator/complex.ycp"; include "product-creator/dialogs.ycp"; @@ -133,6 +134,27 @@ symbol InitSources () { ProductCreator::EnableSource(); + + // remove the source types unsupported by kiwi (#339110) + list<string> sources = []; + list<string> removed = []; + foreach (string url, ProductCreator::Config["sources"]:[], { + map parsed = URL::Parse(url); + if (contains (Kiwi::unsupported_schemes, parsed["scheme"]:"")) + removed = add (removed, url); + else + sources = add (sources, url); + }); + ProductCreator::Config["sources"] = sources; + if (removed != []) + { + // message popup, %1 is a \n separated list + Popup::Message (sformat (_("These installation sources are not supported by kiwi: + +%1. + +They were removed from current configuration."), mergestring (removed, "\n"))); + } return `next; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org