Attachment 244855 Details for Bug 369450

[patch] zypp rpm install output callback

rpm-output-line-callback.diff (text/plain), 2.28 KB, created by Jan Kupec on 2008-10-10 12:27:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kupec

Created: 2008-10-10 12:27:48 UTC

Size: 2.28 KB

patch

obsolete

>Index: zypp/ZYppCallbacks.h
>===================================================================
>--- zypp/ZYppCallbacks.h	(revision 11263)
>+++ zypp/ZYppCallbacks.h	(working copy)
>@@ -476,6 +476,9 @@
>         virtual bool progress(int /*value*/, Resolvable::constPtr /*resolvable*/)
>         { return true; }
> 
>+        virtual void outputLine(const std::string & line)
>+        {}
>+
>         virtual Action problem(
>           Resolvable::constPtr /*resolvable*/
>   	  , Error /*error*/
>Index: zypp/target/rpm/RpmCallbacks.h
>===================================================================
>--- zypp/target/rpm/RpmCallbacks.h	(revision 11263)
>+++ zypp/target/rpm/RpmCallbacks.h	(working copy)
>@@ -87,6 +87,9 @@
>   {
>     return true;
>   }
>+  
>+  virtual void outputLine( const std::string & line)
>+  { }
> 
>   /** Finish operation in case of success */
>   virtual void finish()
>Index: zypp/target/rpm/RpmDb.cc
>===================================================================
>--- zypp/target/rpm/RpmDb.cc	(revision 11263)
>+++ zypp/target/rpm/RpmDb.cc	(working copy)
>@@ -2044,7 +2044,10 @@
>       report->progress( percent );
>     }
>     else
>+    {
>       rpmmsg += line+'\n';
>+      report->outputLine(line);
>+    }
> 
>     if ( line.substr(0,8) == "warning:" )
>     {
>Index: zypp/target/TargetCallbackReceiver.cc
>===================================================================
>--- zypp/target/TargetCallbackReceiver.cc	(revision 11263)
>+++ zypp/target/TargetCallbackReceiver.cc	(working copy)
>@@ -57,7 +57,12 @@
> 	    _abort = ! _report->progress( percent, _resolvable );
> 	    return _abort;
> 	}
>-	
>+        
>+        void RpmInstallPackageReceiver::outputLine( const std::string & line)
>+        {
>+          _report->outputLine(line);
>+        }
>+
> 	rpm::RpmInstallReport::Action 
> 	RpmInstallPackageReceiver::problem( Exception & excpt_r )
> 	{
>Index: zypp/target/TargetCallbackReceiver.h
>===================================================================
>--- zypp/target/TargetCallbackReceiver.h	(revision 11263)
>+++ zypp/target/TargetCallbackReceiver.h	(working copy)
>@@ -52,6 +52,8 @@
>          */
>         virtual bool progress( unsigned percent );
> 
>+        void outputLine( const std::string & line);
>+
> 	/** inform user about a problem */
> 	virtual rpm::RpmInstallReport::Action problem( Exception & excpt_r );
>

Actions: View | Diff

Attachments on bug 369450: 244855