Author: lslezak Date: Thu Dec 10 09:16:38 2009 New Revision: 60033 URL: http://svn.opensuse.org/viewcvs/yast?rev=60033&view=rev Log: - register Pkg::CallbackSourceReportInit/Destroy() callbacks - required after fix of bug #251726 - 2.13.16 Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp branches/SuSE-SLE-10-SP3-Branch/cd-creator/yast2-cd-creator.spec.in Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION?rev=60033&r1=60032&r2=60033&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/VERSION Thu Dec 10 09:16:38 2009 @@ -1 +1 @@ -2.13.15 +2.13.16 Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes?rev=60033&r1=60032&r2=60033&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/package/yast2-cd-creator.changes Thu Dec 10 09:16:38 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 22 17:00:35 CEST 2009 - lslezak@suse.cz + +- register Pkg::CallbackSourceReportInit/Destroy() callbacks - + required after fix of bug #251726 +- 2.13.16 + +------------------------------------------------------------------- Thu Apr 24 13:20:19 CEST 2008 - lslezak@suse.cz - add 'post-packages' from autoyast profile into the created Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp?rev=60033&r1=60032&r2=60033&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/src/CDCreator.ycp Thu Dec 10 09:16:38 2009 @@ -696,6 +696,24 @@ return true; } +void RegisterCallbacks() +{ + Pkg::CallbackSourceReportStart("CDCreator::CallbackSourceReportStart"); + Pkg::CallbackSourceReportProgress("CDCreator::CallbackSourceReportProgress"); + Pkg::CallbackSourceReportEnd("CDCreator::CallbackSourceReportEnd"); + Pkg::CallbackSourceReportInit("CDCreator::CallbackSourceReportInit"); + Pkg::CallbackSourceReportDestroy("CDCreator::CallbackSourceReportDestroy"); +} + +void UnregisterCallbacks() +{ + Pkg::CallbackSourceReportStart("PackageCallbacks::SourceReportStart"); + Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress"); + Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd"); + Pkg::CallbackSourceReportInit("PackageCallbacks::SourceReportInit"); + Pkg::CallbackSourceReportDestroy("PackageCallbacks::SourceReportDestroy"); +} + /** * Create Skeleton * @return boolean true on success @@ -728,6 +746,8 @@ string descrDir = ""; string dataDir = ""; + RegisterCallbacks(); + if (Arch::i386() || Arch::x86_64()) { if (Config["code10"]:false) @@ -752,7 +772,10 @@ meta_local = ReadContentFile(source + "/content"); if (source == "") + { + UnregisterCallbacks(); return false; + } y2milestone("source: %1", source); descr_dir = this_source["productData","descrdir"]:"suse/setup/descr"; @@ -840,7 +863,10 @@ y2debug("source data: %1", this_source["sourceData", "url"]:"" ); success = (boolean)SCR::Execute(.target.mkdir, sformat("%1/%2", skel_root, dataDir)); if (!success) + { + UnregisterCallbacks(); return false; + } Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrDir)); @@ -1163,6 +1189,8 @@ // update MD5SUMS file success = success && UpdateMD5File(sformat("%1/%2", skel_root, descrDir)); + UnregisterCallbacks(); + return success; } @@ -1660,6 +1688,15 @@ y2debug("source_id: %1, url: %2, task: %3, error: %4, reason: %5", numeric_id, url, task, error, reason); } +global void CallbackSourceReportInit() +{ + y2debug("CDCreator::CallbackSourceReportInit()"); +} + +global void CallbackSourceReportDestroy() +{ + y2debug("CDCreator::CallbackSourceReportDestroy()"); +} /** * CopyPackages() @@ -1676,9 +1713,7 @@ boolean ret = true; // disable source report callbacks - there is a progress dialog - Pkg::CallbackSourceReportStart("CDCreator::CallbackSourceReportStart"); - Pkg::CallbackSourceReportProgress("CDCreator::CallbackSourceReportProgress"); - Pkg::CallbackSourceReportEnd("CDCreator::CallbackSourceReportEnd"); + RegisterCallbacks(); y2milestone("Package summary: %1", toCopy); @@ -1737,9 +1772,7 @@ basedir)) == 0); // restore the source report callbacks - Pkg::CallbackSourceReportStart("PackageCallbacks::SourceReportStart"); - Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress"); - Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd"); + UnregisterCallbacks(); return ret; } Modified: branches/SuSE-SLE-10-SP3-Branch/cd-creator/yast2-cd-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/cd-creator/yast2-cd-creator.spec.in?rev=60033&r1=60032&r2=60033&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/cd-creator/yast2-cd-creator.spec.in (original) +++ branches/SuSE-SLE-10-SP3-Branch/cd-creator/yast2-cd-creator.spec.in Thu Dec 10 09:16:38 2009 @@ -8,6 +8,9 @@ Requires: yast2 >= 2.13.90 BuildRequires: yast2 >= 2.13.90 +# Pkg::CallbackSourceCreateInit/Destroy() +Requires: yast2-pkg-bindings >= 2.13.125 + BuildArchitectures: noarch Summary: Configuration of CD-creator -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org