From 37fa122ae037cb33aa35e3ddb53722b99a679819 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 10 Jan 2017 14:28:54 +0900 Subject: [PATCH] Imported Upstream version 1.11.54 Change-Id: Ie644d96afb46bc2b93c5364f7e36c61f4ef21886 Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- package/zypper.changes | 6 ++++++ src/misc.cc | 2 +- src/solve-commit.cc | 9 ++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 3e6dde4..bda20e7 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -34,7 +34,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "11") -SET(VERSION_PATCH "53") +SET(VERSION_PATCH "54") -# LAST RELEASED: 1.11.53 +# LAST RELEASED: 1.11.54 #======= diff --git a/package/zypper.changes b/package/zypper.changes index a3a77c7..5aa9041 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 13 16:35:48 CEST 2016 - ma@suse.de + +- Fix testing for '-- download*' options (bsc#956480) +- version 1.11.54 + +------------------------------------------------------------------- Mon Mar 14 11:12:35 CET 2016 - ma@suse.de - versioncmp: don't check for zypp lock (bsc#970575) diff --git a/src/misc.cc b/src/misc.cc index 5f0aa94..598a4c9 100644 --- a/src/misc.cc +++ b/src/misc.cc @@ -423,7 +423,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 98a96fd..aeec04c 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -530,6 +530,7 @@ static void show_update_messages(Zypper & zypper, const UpdateNotifications & me 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 @@ -804,7 +805,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; @@ -929,10 +930,8 @@ void solve_and_commit (Zypper & zypper) } // check for running services (fate #300763) - if ( ! ( zypper.cOpts().count("download-only") || zypper.cOpts().count("dry-run") ) - && ( summary.packagesToRemove() - || summary.packagesToUpgrade() - || summary.packagesToDowngrade() ) ) + if ( !dryRunEtc + && ( summary.packagesToRemove() || summary.packagesToUpgrade() || summary.packagesToDowngrade() ) ) { notify_processes_using_deleted_files(zypper); } -- 2.7.4