Author: lslezak Date: Wed Apr 2 16:48:39 2008 New Revision: 45986 URL: http://svn.opensuse.org/viewcvs/yast?rev=45986&view=rev Log: - adapted to the new callback registration scheme (fate#302296) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pro... ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Apr 2 16:48:39 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Apr 2 16:47:28 CEST 2008 - lslezak@suse.cz + +- adapted to the new callback registration scheme (fate#302296) + +------------------------------------------------------------------- Fri Mar 28 16:12:34 CET 2008 - jsuchome@suse.cz - use new ag_anyxml to read parts of config.xml (WIP) Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreato... ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Wed Apr 2 16:48:39 2008 @@ -33,6 +33,7 @@ import "Mode"; import "CommandLine"; import "FileUtils"; +import "PackageCallbacks"; global define void enableSources(); @@ -2506,7 +2507,7 @@ return true; } -global void CallbackSourceReportEnd(integer numeric_id, string url, string task, string error, string reason) +global void CallbackSourceReportEnd(integer numeric_id, string url, string task, symbol error, string reason) { y2debug("source_id: %1, url: %2, task: %3, error: %4, reason: %5", numeric_id, url, task, error, reason); } @@ -2549,29 +2550,29 @@ global void RedirectCallbacks() { - Pkg::CallbackSourceReportStart("ProductCreator::CallbackSourceReportStart"); - Pkg::CallbackSourceReportProgress("ProductCreator::CallbackSourceReportProgress"); - Pkg::CallbackSourceReportEnd("ProductCreator::CallbackSourceReportEnd"); - - Pkg::CallbackInitDownload ("ProductCreator::InitDownload"); - Pkg::CallbackStartDownload ("ProductCreator::StartDownload"); - Pkg::CallbackProgressDownload ("ProductCreator::ProgressDownload"); + Pkg::CallbackSourceReportStart(ProductCreator::CallbackSourceReportStart); + Pkg::CallbackSourceReportProgress(ProductCreator::CallbackSourceReportProgress); + Pkg::CallbackSourceReportEnd(ProductCreator::CallbackSourceReportEnd); + + Pkg::CallbackInitDownload (ProductCreator::InitDownload); + Pkg::CallbackStartDownload (ProductCreator::StartDownload); + Pkg::CallbackProgressDownload (ProductCreator::ProgressDownload); // use the standard callback handler - Pkg::CallbackDoneDownload ("PackageCallbacks::DoneDownload"); - Pkg::CallbackDestDownload ("ProductCreator::DestDownload"); + Pkg::CallbackDoneDownload (PackageCallbacks::DoneDownload); + Pkg::CallbackDestDownload (ProductCreator::DestDownload); } global void ResetCallbacks() { - Pkg::CallbackSourceReportStart("PackageCallbacks::CallbackSourceReportStart"); - Pkg::CallbackSourceReportProgress("PackageCallbacks::CallbackSourceReportProgress"); - Pkg::CallbackSourceReportEnd("PackageCallbacks::CallbackSourceReportEnd"); - - Pkg::CallbackInitDownload ("PackageCallbacks::InitDownload"); - Pkg::CallbackStartDownload ("PackageCallbacks::StartDownload"); - Pkg::CallbackProgressDownload ("PackageCallbacks::ProgressDownload"); - Pkg::CallbackDoneDownload ("PackageCallbacks::DoneDownload"); - Pkg::CallbackDestDownload ("PackageCallbacks::DestDownload"); + Pkg::CallbackSourceReportStart(PackageCallbacks::SourceReportStart); + Pkg::CallbackSourceReportProgress(PackageCallbacks::SourceReportProgress); + Pkg::CallbackSourceReportEnd(PackageCallbacks::SourceReportEnd); + + Pkg::CallbackInitDownload (PackageCallbacks::InitDownload); + Pkg::CallbackStartDownload (PackageCallbacks::StartDownload); + Pkg::CallbackProgressDownload (PackageCallbacks::ProgressDownload); + Pkg::CallbackDoneDownload (PackageCallbacks::DoneDownload); + Pkg::CallbackDestDownload (PackageCallbacks::DestDownload); } /** @@ -2590,7 +2591,7 @@ y2milestone("Package summary: %1", toCopy); - Pkg::CallbackStartDownload ("ProductCreator::StartDownloadEmpty"); + Pkg::CallbackStartDownload (ProductCreator::StartDownloadEmpty); // copy the packages foreach(integer source, map<integer, list<map> > srcmapping, toCopy, @@ -2677,7 +2678,7 @@ } ); - Pkg::CallbackStartDownload ("ProductCreator::StartDownload"); + Pkg::CallbackStartDownload (ProductCreator::StartDownload); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org