Author: lslezak Date: Wed Apr 2 16:32:42 2008 New Revision: 45980 URL: http://svn.opensuse.org/viewcvs/yast?rev=45980&view=rev Log: - moved package callbacks implementation from yast2-packager to yast2 (to break cyclic dependency) (fate#302296) - 2.16.42 Added: trunk/yast2/library/modules/DontShowAgain.ycp - copied unchanged from r45819, trunk/packager/src/modules/DontShowAgain.ycp trunk/yast2/library/packages/src/PackageCallbacks.ycp - copied unchanged from r45967, trunk/packager/src/modules/PackageCallbacks.ycp trunk/yast2/library/packages/src/SignatureCheckCallbacks.ycp - copied unchanged from r45967, trunk/packager/src/modules/SignatureCheckCallbacks.ycp trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp - copied unchanged from r45819, trunk/packager/src/modules/SignatureCheckDialogs.ycp Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/Makefile.am trunk/yast2/library/packages/src/PackageCallbacksInit.ycp trunk/yast2/package/yast2.changes trunk/yast2/yast2.spec.in Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=45980&r1=45979&r2=45980&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Apr 2 16:32:42 2008 @@ -1 +1 @@ -2.16.41 +2.16.42 Modified: trunk/yast2/library/packages/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Makefile.am?rev=45980&r1=45979&r2=45980&view=diff ============================================================================== --- trunk/yast2/library/packages/src/Makefile.am (original) +++ trunk/yast2/library/packages/src/Makefile.am Wed Apr 2 16:32:42 2008 @@ -9,7 +9,10 @@ Package.ycp \ PackageAI.ycp \ PackageSystem.ycp \ - PackageCallbacksInit.ycp \ + PackageCallbacks.ycp \ + PackageCallbacksInit.ycp \ + SignatureCheckCallbacks.ycp \ + SignatureCheckDialogs.ycp \ Product.ycp ynclude_DATA = \ Modified: trunk/yast2/library/packages/src/PackageCallbacksInit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageCallbacksInit.ycp?rev=45980&r1=45979&r2=45980&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacksInit.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacksInit.ycp Wed Apr 2 16:32:42 2008 @@ -14,151 +14,25 @@ module "PackageCallbacksInit"; textdomain "base"; -import "Mode"; +import "PackageCallbacks"; /** - * Register callbacks for media change + * Register package manager callbacks */ -global define void SetMediaCallbacks () { - Pkg::CallbackMediaChange ("PackageCallbacks::MediaChange"); - Pkg::CallbackSourceChange ("PackageCallbacks::SourceChange"); -} - -global void SetScriptCallbacks() -{ - Pkg::CallbackScriptStart("PackageCallbacks::ScriptStart"); - Pkg::CallbackScriptProgress("PackageCallbacks::ScriptProgress"); - Pkg::CallbackScriptProblem("PackageCallbacks::ScriptProblem"); - Pkg::CallbackScriptFinish("PackageCallbacks::ScriptFinish"); - - Pkg::CallbackMessage("PackageCallbacks::Message"); -} - -global void SetScanDBCallbacks () +global void InitPackageCallbacks() { - Pkg::CallbackStartScanDb ("PackageCallbacks::StartScanDb"); - Pkg::CallbackProgressScanDb ("PackageCallbacks::ProgressScanDb"); - Pkg::CallbackErrorScanDb ("PackageCallbacks::ErrorScanDb"); - Pkg::CallbackDoneScanDb ("PackageCallbacks::DoneScanDb"); + y2warning(-1, "PackageCallbacksInit::InitPackageCallbacks() is obsoleted, use PackageCallbacks::InitPackageCallbacks() instead"); + PackageCallbacks::InitPackageCallbacks(); } -global void ResetScanDBCallbacks () +global void SetMediaCallbacks() { - Pkg::CallbackStartScanDb (""); - Pkg::CallbackProgressScanDb (""); - Pkg::CallbackErrorScanDb (""); - Pkg::CallbackDoneScanDb (""); + PackageCallbacks::SetMediaCallbacks(); } -global void SetDownloadCallbacks () +global void PackageCallbacksInit() { - Pkg::CallbackInitDownload ("PackageCallbacks::InitDownload"); - Pkg::CallbackStartDownload ("PackageCallbacks::StartDownload"); - Pkg::CallbackProgressDownload ("PackageCallbacks::ProgressDownload"); - Pkg::CallbackDoneDownload ("PackageCallbacks::DoneDownload"); - Pkg::CallbackDestDownload ("PackageCallbacks::DestDownload"); - Pkg::CallbackStartRefresh("PackageCallbacks::RefreshStarted"); - Pkg::CallbackDoneRefresh("PackageCallbacks::RefreshDone"); -} - -global void ResetDownloadCallbacks () -{ - Pkg::CallbackInitDownload (""); - Pkg::CallbackStartDownload (""); - Pkg::CallbackProgressDownload (""); - Pkg::CallbackDoneDownload (""); - Pkg::CallbackDestDownload (""); - Pkg::CallbackStartRefresh(""); - Pkg::CallbackDoneRefresh(""); -} - - -/** - * Register package manager callbacks - */ -global define void InitPackageCallbacks() { - // register process callbacks (total progress) - Pkg::CallbackProcessStart("PackageCallbacks::ProcessStart"); - Pkg::CallbackProcessProgress("PackageCallbacks::ProcessProgress"); - Pkg::CallbackProcessNextStage("PackageCallbacks::ProcessNextStage"); - Pkg::CallbackProcessDone("PackageCallbacks::ProcessDone"); - - Pkg::CallbackStartProvide ("PackageCallbacks::StartProvide"); - Pkg::CallbackProgressProvide ("PackageCallbacks::ProgressProvide"); - Pkg::CallbackDoneProvide ("PackageCallbacks::DoneProvide"); - Pkg::CallbackStartPackage ("PackageCallbacks::StartPackage"); - Pkg::CallbackProgressPackage ("PackageCallbacks::ProgressPackage"); - Pkg::CallbackDonePackage ("PackageCallbacks::DonePackage"); - - Pkg::CallbackStartDeltaDownload ("PackageCallbacks::StartDeltaProvide"); - Pkg::CallbackProgressDeltaDownload ("PackageCallbacks::ProgressProvide"); - Pkg::CallbackProblemDeltaDownload ("PackageCallbacks::ProblemDeltaDownload"); - Pkg::CallbackFinishDeltaDownload ("PackageCallbacks::FinishPatchDeltaProvide"); - - Pkg::CallbackStartDeltaApply ("PackageCallbacks::StartDeltaApply"); - Pkg::CallbackProgressDeltaApply ("PackageCallbacks::ProgressProvide"); - Pkg::CallbackProblemDeltaApply ("PackageCallbacks::ProblemDeltaApply"); - Pkg::CallbackFinishDeltaApply ("PackageCallbacks::FinishPatchDeltaProvide"); - - Pkg::CallbackStartPatchDownload ("PackageCallbacks::StartPatchProvide"); - Pkg::CallbackProgressPatchDownload ("PackageCallbacks::ProgressProvide"); - Pkg::CallbackProblemPatchDownload ("PackageCallbacks::ProblemPatchDownload"); - Pkg::CallbackFinishPatchDownload ("PackageCallbacks::FinishPatchDeltaProvide"); - - // source create callbacks - Pkg::CallbackSourceCreateStart("PackageCallbacks::SourceCreateStart"); - Pkg::CallbackSourceCreateProgress("PackageCallbacks::SourceCreateProgress"); - Pkg::CallbackSourceCreateError("PackageCallbacks::SourceCreateError"); - Pkg::CallbackSourceCreateEnd("PackageCallbacks::SourceCreateEnd"); - Pkg::CallbackSourceCreateInit("PackageCallbacks::SourceCreateInit"); - Pkg::CallbackSourceCreateDestroy("PackageCallbacks::SourceCreateDestroy"); - - // source probing callbacks - Pkg::CallbackSourceProbeStart("PackageCallbacks::SourceProbeStart"); - Pkg::CallbackSourceProbeFailed("PackageCallbacks::SourceProbeFailed"); - Pkg::CallbackSourceProbeSucceeded("PackageCallbacks::SourceProbeSucceeded"); - Pkg::CallbackSourceProbeProgress("PackageCallbacks::SourceProbeProgress"); - Pkg::CallbackSourceProbeError("PackageCallbacks::SourceProbeError"); - Pkg::CallbackSourceProbeEnd("PackageCallbacks::SourceProbeEnd"); - - // source report callbacks - Pkg::CallbackSourceReportStart("PackageCallbacks::SourceReportStart"); - Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress"); - Pkg::CallbackSourceReportError("PackageCallbacks::SourceReportError"); - Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd"); - Pkg::CallbackSourceReportInit("PackageCallbacks::SourceReportInit"); - Pkg::CallbackSourceReportDestroy("PackageCallbacks::SourceReportDestroy"); - - Pkg::CallbackProgressReportStart("PackageCallbacks::ProgressStart"); - Pkg::CallbackProgressReportProgress("PackageCallbacks::ProgressProgress"); - Pkg::CallbackProgressReportEnd("PackageCallbacks::ProgressEnd"); - - // authentication callback - Pkg::CallbackAuthentication("PackageCallbacks::Authentication"); - - // @see bugzilla #183821 - // Do not register these callbacks in case of AutoInstallation - if (Mode::autoinst() != true) { - // Signature-related callbacks - Pkg::CallbackAcceptUnsignedFile ("SignatureCheckCallbacks::AcceptUnsignedFile"); - Pkg::CallbackAcceptUnknownGpgKey ("SignatureCheckCallbacks::AcceptUnknownGpgKey"); - Pkg::CallbackImportGpgKey ("SignatureCheckCallbacks::ImportGpgKey"); - Pkg::CallbackAcceptNonTrustedGpgKey ("SignatureCheckCallbacks::TrustGpgKey"); - Pkg::CallbackAcceptVerificationFailed ("SignatureCheckCallbacks::AcceptVerificationFailed"); - Pkg::CallbackTrustedKeyAdded ("SignatureCheckCallbacks::TrustedKeyAdded"); - Pkg::CallbackTrustedKeyRemoved ("SignatureCheckCallbacks::TrustedKeyRemoved"); - Pkg::CallbackAcceptFileWithoutChecksum ("SignatureCheckCallbacks::AcceptFileWithoutChecksum"); - Pkg::CallbackAcceptWrongDigest ("SignatureCheckCallbacks::AcceptWrongDigest"); - Pkg::CallbackAcceptUnknownDigest ("SignatureCheckCallbacks::AcceptUnknownDigest"); - } - - SetMediaCallbacks (); - - SetScriptCallbacks(); - - SetScanDBCallbacks(); - - SetDownloadCallbacks(); + y2warning(-1, "PackageCallbacksInit module is obsoleted, use PackageCallbacks instead"); } /* EOF */ Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=45980&r1=45979&r2=45980&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Apr 2 16:32:42 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 2 16:31:13 CEST 2008 - lslezak@suse.cz + +- moved package callbacks implementation from yast2-packager + to yast2 (to break cyclic dependency) (fate#302296) +- 2.16.42 + +------------------------------------------------------------------- Wed Apr 2 16:21:09 CEST 2008 - locilka@suse.cz - SCR Agent for managing /etc/ssh/sshd_config has been moved here Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=45980&r1=45979&r2=45980&view=diff ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Wed Apr 2 16:32:42 2008 @@ -5,7 +5,7 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-perl-bindings # Needed already in build time -BuildRequires: yast2-pkg-bindings >= 2.16.16 +BuildRequires: yast2-pkg-bindings >= 2.16.23 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -15,8 +15,8 @@ # Mod_UI Requires: yast2-ycp-ui-bindings >= 2.16.37 -# Pkg::CallbackRefresh*() functions -Requires: yast2-pkg-bindings >= 2.16.16 +# changed callback registration +Requires: yast2-pkg-bindings >= 2.16.23 Requires: yast2_ui yast2_theme # For Cron Agent, Module Requires: perl-Config-Crontab -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org