From: DongHun Kwak Date: Tue, 1 Nov 2016 01:33:45 +0000 (+0900) Subject: Imported Upstream version 14.38.5 X-Git-Tag: upstream/16.3.1~93 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=905e524a8787ccc85a3b8c885e3681c2e8dfb7a3;p=platform%2Fupstream%2Flibzypp.git Imported Upstream version 14.38.5 Change-Id: I4e14e441de1e38ad01498d577c5ba5095e042483 Signed-off-by: DongHun Kwak --- diff --git a/VERSION.cmake b/VERSION.cmake index 0b5785d..9a1436d 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "14") SET(LIBZYPP_COMPATMINOR "30") SET(LIBZYPP_MINOR "38") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") # -# LAST RELEASED: 14.38.4 (30) +# LAST RELEASED: 14.38.5 (30) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 97a043d..fdb8702 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jun 1 16:14:04 CEST 2015 - ma@suse.de + +- FindFileConflicts: avoid nested exception on user abort (bnc#931601) +- version 14.38.5 (30) + +------------------------------------------------------------------- Wed May 6 14:26:54 CEST 2015 - ma@suse.de - Fix repo alias containing ']' not handled correctly (bnc#929528) diff --git a/zypp/target/TargetImpl.commitFindFileConflicts.cc b/zypp/target/TargetImpl.commitFindFileConflicts.cc index 399567c..8aba984 100644 --- a/zypp/target/TargetImpl.commitFindFileConflicts.cc +++ b/zypp/target/TargetImpl.commitFindFileConflicts.cc @@ -138,7 +138,10 @@ namespace zypp // lambda receives progress trigger and translates into report auto sendProgress = [&]( const ProgressData & progress_r )->bool { if ( ! report->progress( progress_r, cb.noFilelist() ) ) + { + progress.noSend(); // take care progress DTOR does not trigger a final report (2nd exeption) ZYPP_THROW( AbortRequestException() ); + } return true; }; progress.sendTo( sendProgress );