support 'dry run' (#159467)

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 74aeaa684800393e3525f4211ac788310116e0fd..1c3c7fcb2354c3009a6650a41a514b53f43d62b1 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -155,7 +155,9 @@ namespace zypp
     }
 
 
     }
 
 

-    int TargetImpl::commit(ResPool pool_r, unsigned int medianr, TargetImpl::PoolItemList & errors_r, TargetImpl::PoolItemList & remaining_r, TargetImpl::PoolItemList & srcremaining_r)
+    int TargetImpl::commit( ResPool pool_r, unsigned int medianr,
+                           TargetImpl::PoolItemList & errors_r, TargetImpl::PoolItemList & remaining_r,
+                           TargetImpl::PoolItemList & srcremaining_r, bool dry_run )

     {
       MIL << "TargetImpl::commit(<pool>, " << medianr << ")" << endl;
 
     {
       MIL << "TargetImpl::commit(<pool>, " << medianr << ")" << endl;
 


@@ -175,8 +177,8 @@ namespace zypp
       commit (to_uninstall);
 
       if (medianr == 0) {                      // commit all
       commit (to_uninstall);
 
       if (medianr == 0) {                      // commit all

-        remaining_r = commit( to_install );
-        srcremaining_r = commit( to_srcinstall );
+        remaining_r = commit( to_install, dry_run );
+        srcremaining_r = commit( to_srcinstall, dry_run );

       }
       else
       {
       }
       else
       {


@@ -197,7 +199,7 @@ namespace zypp
             current_install.push_back( *it );
           }
         }
             current_install.push_back( *it );
           }
         }

-        TargetImpl::PoolItemList bad = commit (current_install);
+        TargetImpl::PoolItemList bad = commit( current_install, dry_run );

         remaining_r.insert(remaining_r.end(), bad.begin(), bad.end());
 
         for (TargetImpl::PoolItemList::iterator it = to_srcinstall.begin(); it != to_srcinstall.end(); ++it)
         remaining_r.insert(remaining_r.end(), bad.begin(), bad.end());
 
         for (TargetImpl::PoolItemList::iterator it = to_srcinstall.begin(); it != to_srcinstall.end(); ++it)


@@ -213,7 +215,7 @@ namespace zypp
             current_srcinstall.push_back( *it );
           }
         }
             current_srcinstall.push_back( *it );
           }
         }

-        bad = commit (current_srcinstall);
+        bad = commit( current_srcinstall, dry_run );

         srcremaining_r.insert(srcremaining_r.end(), bad.begin(), bad.end());
       }
       return to_install.size() - remaining_r.size();
         srcremaining_r.insert(srcremaining_r.end(), bad.begin(), bad.end());
       }
       return to_install.size() - remaining_r.size();


@@ -221,11 +223,11 @@ namespace zypp
 
 
     TargetImpl::PoolItemList
 
 
     TargetImpl::PoolItemList

-    TargetImpl::commit( const TargetImpl::PoolItemList & items_r)
+    TargetImpl::commit( const TargetImpl::PoolItemList & items_r, bool dry_run )

     {
       TargetImpl::PoolItemList remaining;
 
     {
       TargetImpl::PoolItemList remaining;
 

-      MIL << "TargetImpl::commit(<list>)" << endl;
+      MIL << "TargetImpl::commit(<list>" << (dry_run?", dry_run" : "") << ")" << endl;

       
       bool abort = false;
 
       
       bool abort = false;
 


@@ -247,12 +249,13 @@ namespace zypp
             RpmInstallPackageReceiver progress( it->resolvable() );
             progress.connect();
             bool success = true;
             RpmInstallPackageReceiver progress( it->resolvable() );
             progress.connect();
             bool success = true;

+           unsigned flags = 0;

 
             try {
               progress.tryLevel( target::rpm::InstallResolvableReport::RPM );
 
             try {
               progress.tryLevel( target::rpm::InstallResolvableReport::RPM );

-                
-              rpm().installPackage(localfile,
-                  p->installOnly() ? rpm::RpmDb::RPMINST_NOUPGRADE : 0);
+             if (p->installOnly()) flags |= rpm::RpmDb::RPMINST_NOUPGRADE;
+             if (dry_run) flags |= rpm::RpmDb::RPMINST_TEST;
+              rpm().installPackage( localfile, flags );

 
              if( progress.aborted() )
              {
 
              if( progress.aborted() )
              {


@@ -266,10 +269,17 @@ namespace zypp
             catch (Exception & excpt_r) {
               ZYPP_CAUGHT(excpt_r);
               WAR << "Install failed, retrying with --nodeps" << endl;
             catch (Exception & excpt_r) {
               ZYPP_CAUGHT(excpt_r);
               WAR << "Install failed, retrying with --nodeps" << endl;

+             if (dry_run) {
+                 WAR << "dry run failed" << endl;
+                 abort = true;
+                 progress.disconnect(); 
+                 break;
+             }
+

               try {
                 progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS );
               try {
                 progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS );

-                rpm().installPackage(localfile,
-                p->installOnly() ? rpm::RpmDb::RPMINST_NOUPGRADE : rpm::RpmDb::RPMINST_NODEPS);
+               flags |= rpm::RpmDb::RPMINST_NODEPS;
+                rpm().installPackage( localfile, flags );

 
                if( progress.aborted() )
                {
 
                if( progress.aborted() )
                {


@@ -286,8 +296,8 @@ namespace zypp
     
                 try {
                   progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE );
     
                 try {
                   progress.tryLevel( target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE );

-                  rpm().installPackage(localfile,
-                      p->installOnly() ? rpm::RpmDb::RPMINST_NOUPGRADE : (rpm::RpmDb::RPMINST_NODEPS|rpm::RpmDb::RPMINST_FORCE));
+                 flags |= rpm::RpmDb::RPMINST_FORCE;
+                  rpm().installPackage( localfile, flags );

                 }
                 catch (Exception & excpt_r) {
                   remaining.push_back( *it );
                 }
                 catch (Exception & excpt_r) {
                   remaining.push_back( *it );


@@ -304,33 +314,39 @@ namespace zypp
                }
               }
             }
                }
               }
             }

-            if (success) {
+            if (success
+               && !dry_run)
+           {

              it->status().setTransact( false, ResStatus::USER );
             }
             progress.disconnect();
              it->status().setTransact( false, ResStatus::USER );
             }
             progress.disconnect();

-           p->source().releaseFile(p->plainRpm(), p->mediaId());
+           p->source().releaseFile( p->plainRpm(), p->mediaId() );

           }
           else
           {
            bool success = true;
 
           }
           else
           {
            bool success = true;
 

-            RpmRemovePackageReceiver progress(it->resolvable());
+            RpmRemovePackageReceiver progress( it->resolvable() );

             progress.connect();
             progress.connect();

+           unsigned flags = rpm::RpmDb::RPMINST_NODEPS;
+           if (dry_run) flags |= rpm::RpmDb::RPMINST_TEST;

             try {
             try {

-              rpm().removePackage( p, rpm::RpmDb::RPMINST_NODEPS );
+              rpm().removePackage( p, flags );

             }
             catch (Exception & excpt_r) {
              WAR << "removal of " << p << " failed";
              success = false;
               ZYPP_CAUGHT( excpt_r );
             }
             }
             catch (Exception & excpt_r) {
              WAR << "removal of " << p << " failed";
              success = false;
               ZYPP_CAUGHT( excpt_r );
             }

-           if (success) {
+           if (success
+               && !dry_run)
+           {

              it->status().setTransact( false, ResStatus::USER );
            }
             progress.disconnect();
           }
         }
              it->status().setTransact( false, ResStatus::USER );
            }
             progress.disconnect();
           }
         }

-        else // other resolvables
+        else if (!dry_run) // other resolvables

         {
           if ( isStorageEnabled() )
           {
         {
           if ( isStorageEnabled() )
           {

diff --git a/zypp/target/TargetImpl.h b/zypp/target/TargetImpl.h
index 48b94268fec61b4296dfdcf0719ce2e5aaf717f4..0fa8748041033e7eeabd8c6eea239fd68981fb97 100644 (file)
--- a/zypp/target/TargetImpl.h
+++ b/zypp/target/TargetImpl.h
@@ -87,7 +87,7 @@ namespace zypp
       /** Commit changes in the pool
          media = 0 means any/all medias
          media > 0 means limit commits to this media */
       /** Commit changes in the pool
          media = 0 means any/all medias
          media > 0 means limit commits to this media */

-      int commit( ResPool pool_r, unsigned int medianr, PoolItemList & errors_r, PoolItemList & remaining_r, PoolItemList & srcremaining_r );
+      int commit( ResPool pool_r, unsigned int medianr, PoolItemList & errors_r, PoolItemList & remaining_r, PoolItemList & srcremaining_r, bool dry_run = false );

 
       /** enables the storage target */
       bool isStorageEnabled() const;
 
       /** enables the storage target */
       bool isStorageEnabled() const;


@@ -95,7 +95,7 @@ namespace zypp
 
       /** Commit ordered changes
          return uncommitted ones (due to error) */
 
       /** Commit ordered changes
          return uncommitted ones (due to error) */

-      PoolItemList commit( const PoolItemList & items_r );
+      PoolItemList commit( const PoolItemList & items_r, bool dry_run = false );

 
       /** Overload to realize stream output. */
       virtual std::ostream & dumpOn( std::ostream & str ) const
 
       /** Overload to realize stream output. */
       virtual std::ostream & dumpOn( std::ostream & str ) const