[yast-commit] r38159 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp

Author: lslezak Date: Mon May 28 16:01:34 2007 New Revision: 38159 URL: http://svn.opensuse.org/viewcvs/yast?rev=38159&view=rev Log: - reinitialize the package manager before creating another image Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp 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=38159&r1=38158&r2=38159&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 Mon May 28 16:01:34 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 28 15:59:55 CEST 2007 - lslezak@suse.cz + +- reinitialize the package manager before creating another image + +------------------------------------------------------------------- Mon May 28 09:01:06 CEST 2007 - lslezak@suse.cz - install "yast2-instserver" package (.content_file agent) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp?rev=38159&r1=38158&r2=38159&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Mon May 28 16:01:34 2007 @@ -93,6 +93,9 @@ // What we want to create with kiwi global string kiwi_task = "iso"; +// original source configuration, needed to reset the package manager +list > original_config = nil; + /** * Data was modified? * @return true if modified @@ -287,6 +290,11 @@ } }); + if (id == -1) + { + y2error("Source %1 not found!", url); + } + return id; }); @@ -1815,6 +1823,19 @@ global define void enableSources()``{ + // TODO FIXME: use better way to reset the source config in the package manager + if (original_config != nil) + { + y2milestone("Restoring original config: %1", original_config); + Pkg::SourceEditSet(original_config); + Pkg::SourceFinishAll(); + } + else + { + original_config = Pkg::SourceEditGet(); + y2milestone("Current source configuration: %1", original_config); + } + Pkg::SourceStartManager(false); y2milestone("sources: %1", ProductCreator::Config["sources"]:[]); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org