Imported Upstream version 1.12.39

Change-Id: I08b157f7094bf0891c35b19c4b216eb2f53daf77
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 13101e9..fdb3b95 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "12")
-SET(VERSION_PATCH "38")
+SET(VERSION_PATCH "39")
 
-# LAST RELEASED: 1.12.38
+# LAST RELEASED: 1.12.39
 #=======

diff --git a/package/zypper.changes b/package/zypper.changes
index cd78aed..b81c5b3 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Apr 13 16:35:16 CEST 2016 - ma@suse.de
+
+- Fix testing for '-- download*' options (bsc#956480)
+- version 1.12.39
+
+-------------------------------------------------------------------
 Tue Apr  5 18:26:17 CEST 2016 - ma@suse.de
 
 - Update sle-zypper-po.tar.bz2 (bsc#972768)

diff --git a/src/misc.cc b/src/misc.cc
index 8449098..785a46f 100644 (file)
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -375,7 +375,7 @@ void install_src_pkgs( Zypper & zypper )
 
     try
     {
-      if ( zypper.cOpts().find("download-only") != zypper.cOpts().end() )
+      if ( get_download_option( zypper, true ) == DownloadOnly )
       {
         God->provideSrcPackage( srcpkg ).resetDispose();
 

diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index b030274..a1b8a3f 100755 (executable)
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -507,6 +507,7 @@ static void show_update_messages( Zypper & zypper, const UpdateNotifications & m
 void solve_and_commit ( Zypper & zypper )
 {
   bool need_another_solver_run = true;
+  bool dryRunEtc = zypper.cOpts().count("dry-run") || ( get_download_option( zypper, true ) == DownloadOnly );
   do
   {
     // CALL SOLVER
@@ -775,7 +776,7 @@ void solve_and_commit ( Zypper & zypper )
           gData.show_media_progress_hack = false;
          gData.entered_commit = false;
 
-         if ( !result.allDone() && !( ( copts.count("dry-run") || zypper.cOpts().count("download-only") ) && result.noError() ) )
+         if ( !result.allDone() && !( dryRunEtc && result.noError() ) )
          { zypper.setExitCode( result.attemptToModify() ? ZYPPER_EXIT_ERR_COMMIT : ZYPPER_EXIT_ERR_ZYPP ); }   // error message comes later....
 
           MIL << endl << "DONE" << endl;
@@ -885,7 +886,7 @@ void solve_and_commit ( Zypper & zypper )
        }
 
         // check for running services (fate #300763)
-        if ( ! ( zypper.cOpts().count("download-only") || zypper.cOpts().count("dry-run") )
+        if ( !dryRunEtc
          && ( summary.packagesToRemove() || summary.packagesToUpgrade() || summary.packagesToDowngrade() ) )
        {
           notify_processes_using_deleted_files( zypper );