From: Michael Andres Date: Tue, 31 May 2011 16:05:38 +0000 (+0200) Subject: No longer use deprecated ZYppCommitResult methods. X-Git-Tag: 1.6.9~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42ed56402bc3a4a712f79dd0a1be916047f514b9;p=platform%2Fupstream%2Fzypper.git No longer use deprecated ZYppCommitResult methods. --- diff --git a/src/solve-commit.cc b/src/solve-commit.cc index 14bd4e4..3adb6ca 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -763,7 +763,8 @@ void solve_and_commit (Zypper & zypper) gData.show_media_progress_hack = false; - if (!result._errors.empty()) + ZYppCommitResult::InsDelCnt errors( result.errorCount() ); // failed install/delete actions + if ( errors.first || errors.second ) zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); s.clear(); s << result; diff --git a/zypper.spec.cmake b/zypper.spec.cmake index e81b235..2161c14 100644 --- a/zypper.spec.cmake +++ b/zypper.spec.cmake @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 9.3.0 +BuildRequires: libzypp-devel >= 9.5.0 BuildRequires: boost-devel >= 1.33.1 BuildRequires: gettext-devel >= 0.15 BuildRequires: readline-devel >= 5.1