From: DongHun Kwak Date: Tue, 10 Jan 2017 05:26:23 +0000 (+0900) Subject: Imported Upstream version 1.11.37 X-Git-Tag: upstream/1.11.37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F109367%2F1;p=platform%2Fupstream%2Fzypper.git Imported Upstream version 1.11.37 Change-Id: I75fa43f20afabafe50729ae1c8956447d2e67c7e Signed-off-by: DongHun Kwak --- diff --git a/VERSION.cmake b/VERSION.cmake index 8e6431b..644b7cd 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -34,7 +34,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "11") -SET(VERSION_PATCH "36") +SET(VERSION_PATCH "37") -# LAST RELEASED: 1.11.36 +# LAST RELEASED: 1.11.37 #======= diff --git a/package/zypper.changes b/package/zypper.changes index 381e61a..1e6fab5 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,29 @@ ------------------------------------------------------------------- +Thu Sep 24 15:11:01 CEST 2015 - ma@suse.de + +- zypper.conf: new option commit/psCheckAccessDeleted to avoid 'lsof' + call after commit. On some systems 'lsof' seems to perform very + slow, and the check takes up to several minutes. Due to this it's + possible to disable the automatic check after each commit. Explicit + calls to 'zypper ps' are not affected by this option. (bsc#945169) +- version 1.11.37 + +------------------------------------------------------------------- +Thu Sep 17 01:16:20 CEST 2015 - ma@suse.de + +- Update sle-zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Sep 17 01:14:43 CEST 2015 - ma@suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Sun Sep 13 01:14:21 CEST 2015 - ma@suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- Wed Sep 9 16:31:23 CEST 2015 - ma@suse.de - patch --updatestack-only: Install only patches which affect diff --git a/po/sle-zypper-po.tar.bz2 b/po/sle-zypper-po.tar.bz2 index 665f044..41bcb1b 100644 Binary files a/po/sle-zypper-po.tar.bz2 and b/po/sle-zypper-po.tar.bz2 differ diff --git a/po/zypper-po.tar.bz2 b/po/zypper-po.tar.bz2 index bbab13a..8f5f8cb 100644 Binary files a/po/zypper-po.tar.bz2 and b/po/zypper-po.tar.bz2 differ diff --git a/src/Config.cc b/src/Config.cc index 43c0a65..50edd5c 100644 --- a/src/Config.cc +++ b/src/Config.cc @@ -100,6 +100,8 @@ namespace SOLVER_INSTALL_RECOMMENDS, SOLVER_FORCE_RESOLUTION_COMMANDS, + COMMIT_PS_CHECK_ACCESS_DELETED, + COLOR_USE_COLORS, COLOR_RESULT, COLOR_MSG_STATUS, @@ -129,6 +131,8 @@ namespace { "solver/installRecommends", ConfigOption::SOLVER_INSTALL_RECOMMENDS }, { "solver/forceResolutionCommands", ConfigOption::SOLVER_FORCE_RESOLUTION_COMMANDS }, + { "commit/psCheckAccessDeleted", ConfigOption::COMMIT_PS_CHECK_ACCESS_DELETED }, + { "color/useColors", ConfigOption::COLOR_USE_COLORS }, //"color/background" LEGACY { "color/result", ConfigOption::COLOR_RESULT }, @@ -169,6 +173,7 @@ namespace Config::Config() : repo_list_columns("anr") , solver_installRecommends(!ZConfig::instance().solver_onlyRequires()) + , psCheckAccessDeleted(true) , do_colors (false) , color_useColors ("autodetect") , color_result (namedColor("default")) @@ -232,6 +237,11 @@ void Config::read( const std::string & file ) solver_forceResolutionCommands.insert(ZypperCommand(str::trim(*c))); } + // ---------------[ commit ]------------------------------------------------ + + s = augeas.getOption(asString( ConfigOption::COMMIT_PS_CHECK_ACCESS_DELETED )); + if ( ! s.empty() ) + psCheckAccessDeleted = str::strToBool( s, psCheckAccessDeleted ); // ---------------[ colors ]------------------------------------------------ diff --git a/src/Config.h b/src/Config.h index f6f1f6c..2423021 100644 --- a/src/Config.h +++ b/src/Config.h @@ -33,6 +33,8 @@ struct Config bool solver_installRecommends; std::set solver_forceResolutionCommands; + bool psCheckAccessDeleted; ///< do post commit 'zypper ps' check? + /** * Whether to colorize the output. This is evaluated according to * color_useColors and has_colors() diff --git a/src/solve-commit.cc b/src/solve-commit.cc index a590f31..937bdda 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -442,6 +442,13 @@ ZYppCommitPolicy get_commit_policy(Zypper & zypper) */ static void notify_processes_using_deleted_files(Zypper & zypper) { + if ( ! zypper.config().psCheckAccessDeleted ) + { + zypper.out().info( str::form(_("Check for running processes using deleted libraries is disabled in zypper.conf. Run '%s' to check manually."), + "zypper ps" ) ); + return; // disabled in config + } + zypper.out().info( _("Checking for running processes using deleted libraries..."), Out::HIGH); zypp::CheckAccessDeleted checker(false); // wait for explicit call to check() diff --git a/zypper.conf b/zypper.conf index 50033ac..0984c0c 100644 --- a/zypper.conf +++ b/zypper.conf @@ -94,6 +94,20 @@ ## Default value: remove # forceResolutionCommands = remove +[commit] + +## Post commit check for processes/services using old/deleted files +## +## Like 'zypper ps', the post commit check for processes/services using +## old/deleted files calls 'lsof'. On some systems 'lsof' seems to perform +## very slow, and the check takes up to several minutes. Due to this it's +## possible to disable the automatic check after each commit. Explicit calls +## to 'zypper ps' are not affected by this option. +## +## Valid values: boolean +## Default value: yes +## +# psCheckAccessDeleted = yes [color]