provide also the level of RPM pushing in callbacks

diff --git a/zypp/ZYppCallbacks.h b/zypp/ZYppCallbacks.h
index 6530d3dcff25278c7d6194e913f6cb55a947e3c8..e11862cc5c7b2a1e4febfef120be561211e70474 100644 (file)
--- a/zypp/ZYppCallbacks.h
+++ b/zypp/ZYppCallbacks.h
@@ -233,6 +233,13 @@ namespace zypp
          INVALID               // th resolvable is invalid
         };
       
+        // the level of RPM pushing
+        enum RpmLevel {
+            RPM,
+            RPM_NODEPS,
+            RPM_NODEPS_FORCE
+        };
+
         virtual void start(
          Resolvable::constPtr resolvable
         ) {}
@@ -243,13 +250,15 @@ namespace zypp
         virtual Action problem(
           Resolvable::constPtr resolvable
          , Error error
-        , std::string description
+         , std::string description
+         , RpmLevel level
         ) { return ABORT; }
 
         virtual void finish(
           Resolvable::constPtr resolvable
           , Error error
          , std::string reason
+         , RpmLevel level
         ) {}
       };
     
@@ -279,7 +288,7 @@ namespace zypp
         virtual Action problem(
           Resolvable::Ptr resolvable
          , Error error
-        , std::string description
+         , std::string description
         ) { return ABORT; }
 
         virtual void finish(

diff --git a/zypp/target/TargetCallbackReceiver.cc b/zypp/target/TargetCallbackReceiver.cc
index f0f14481b2c793ae5f945934d39207112d481254..128bc6a45b51224d40a1d6f7c7c621933d0cacec 100644 (file)
--- a/zypp/target/TargetCallbackReceiver.cc
+++ b/zypp/target/TargetCallbackReceiver.cc
@@ -24,6 +24,7 @@ namespace zypp
        RpmInstallPackageReceiver::RpmInstallPackageReceiver (Resolvable::constPtr res)
            : callback::ReceiveReport<rpm::RpmInstallReport> ()
            , _resolvable (res)
+           , _level( target::rpm::InstallResolvableReport::RPM )
        {
        }
 
@@ -61,6 +62,7 @@ namespace zypp
                _report->problem( _resolvable
                    , rpm::InstallResolvableReport::INVALID
                    , excpt_r.msg()
+                   , _level
                );
                
            switch (user) {
@@ -78,13 +80,18 @@ namespace zypp
         /** Finish operation in case of success */
         void RpmInstallPackageReceiver::finish()
        {
-           _report->finish( _resolvable, rpm::InstallResolvableReport::NO_ERROR, std::string() );
+           _report->finish( _resolvable, rpm::InstallResolvableReport::NO_ERROR, std::string(), _level );
        }
 
         /** Finish operation in case of success */
         void RpmInstallPackageReceiver::finish( Exception & excpt_r )
        {
-           _report->finish( _resolvable, rpm::InstallResolvableReport::INVALID, std::string() );
+           _report->finish( _resolvable, rpm::InstallResolvableReport::INVALID, std::string(), _level );
+       }
+       
+       void RpmInstallPackageReceiver::tryLevel( target::rpm::InstallResolvableReport::RpmLevel level_r )
+       {
+           _level = level_r;
        }
 
     /////////////////////////////////////////////////////////////////

diff --git a/zypp/target/TargetCallbackReceiver.h b/zypp/target/TargetCallbackReceiver.h
index 36545c9dab171e38cf93043f5ad1143510634262..aa07a14d55ad1276b5aa32b879042f2b0510b6a0 100644 (file)
--- a/zypp/target/TargetCallbackReceiver.h
+++ b/zypp/target/TargetCallbackReceiver.h
@@ -27,6 +27,7 @@ namespace zypp
     {
        callback::SendReport <rpm::InstallResolvableReport> _report;
        Resolvable::constPtr _resolvable;
+       target::rpm::InstallResolvableReport::RpmLevel _level;
 
       public:
 
@@ -39,6 +40,8 @@ namespace zypp
 
         /** Start the operation */
         virtual void start( const Pathname & name );
+       
+       void tryLevel( target::rpm::InstallResolvableReport::RpmLevel level_r );
 
         /**
          * Inform about progress

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 51e5f1648a9fc317b462b0e45befce6679f49064..0d51c3b1dfe86bffa95da111c36ef266d5e782b5 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -148,6 +148,8 @@ namespace zypp
            progress.connect();
 
            try {
+               progress.tryLevel( target::rpm::InstallResolvableReport::RPM );
+               
                rpm().installPackage(p->getPlainRpm(),
                    p->installOnly() ? rpm::RpmDb::RPMINST_NOUPGRADE : 0);
            }
@@ -156,6 +158,7 @@ namespace zypp
 
                WAR << "Install failed, retrying with --nodeps" << endl;
                try {
+                   progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS );
                    rpm().installPackage(p->getPlainRpm(),
                        p->installOnly() ? rpm::RpmDb::RPMINST_NOUPGRADE : rpm::RpmDb::RPMINST_NODEPS);
                }
@@ -164,6 +167,7 @@ namespace zypp
                    WAR << "Install failed again, retrying with --force --nodeps" << endl;
 
                    try {
+                       progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE );
                        rpm().installPackage(p->getPlainRpm(),
                            p->installOnly() ? rpm::RpmDb::RPMINST_NOUPGRADE : (rpm::RpmDb::RPMINST_NODEPS|rpm::RpmDb::RPMINST_FORCE));
                    }