Imported Upstream version 14.48.1

diff --git a/VERSION.cmake b/VERSION.cmake
index a5a44cb..8863f1e 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
 SET(LIBZYPP_MINOR "48")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
 #
-# LAST RELEASED: 14.48.0 (39)
+# LAST RELEASED: 14.48.1 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index a20490e..389dd5b 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Jul 19 10:22:58 CEST 2019 - ma@suse.de
+
+- commit: Run file conflict check on dry-run (best with download-only)
+  (bsc#1140039)
+- version 14.48.1 (39)
+
+-------------------------------------------------------------------
 Fri Jan 18 14:26:10 CET 2019 - ma@suse.de
 
 - PoolItemBest: Optionally prefer not locked packages (bsc#1113296)

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 908869e..275f93a 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -1077,6 +1077,7 @@ namespace zypp
     {
       // ----------------------------------------------------------------- //
       ZYppCommitPolicy policy_r( policy_rX );
+      bool explicitDryRun = policy_r.dryRun(); // explicit dry run will trigger a fileconflict check, implicit (download-only) not.
 
       // Fake outstanding YCP fix: Honour restriction to media 1
       // at installation, but install all remaining packages if post-boot.
@@ -1295,12 +1296,20 @@ namespace zypp
          else
          {
            DBG << "dryRun/downloadOnly: Not installing/deleting anything." << endl;
+           if ( explicitDryRun ) {
+             // if cache is preloaded, check for file conflicts
+             commitFindFileConflicts( policy_r, result );
+           }
          }
        }
       }
       else
       {
         DBG << "dryRun: Not downloading/installing/deleting anything." << endl;
+       if ( explicitDryRun ) {
+         // if cache is preloaded, check for file conflicts
+         commitFindFileConflicts( policy_r, result );
+       }
       }
 
       ///////////////////////////////////////////////////////////////////