projects
/
platform
/
upstream
/
zypper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b6bf43
)
Adapt to changed ZYppCommitResult api
author
Michael Andres
<ma@suse.de>
Wed, 8 Jun 2011 11:12:24 +0000
(13:12 +0200)
committer
Michael Andres
<ma@suse.de>
Wed, 8 Jun 2011 11:13:27 +0000
(13:13 +0200)
src/solve-commit.cc
patch
|
blob
|
history
zypper.spec.cmake
patch
|
blob
|
history
diff --git
a/src/solve-commit.cc
b/src/solve-commit.cc
index
3adb6ca
..
066844c
100755
(executable)
--- a/
src/solve-commit.cc
+++ b/
src/solve-commit.cc
@@
-763,8
+763,7
@@
void solve_and_commit (Zypper & zypper)
gData.show_media_progress_hack = false;
- ZYppCommitResult::InsDelCnt errors( result.errorCount() ); // failed install/delete actions
- if ( errors.first || errors.second )
+ if ( ! result.noError() )
zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP);
s.clear(); s << result;
diff --git
a/zypper.spec.cmake
b/zypper.spec.cmake
index
2161c14
..
1b94328
100644
(file)
--- a/
zypper.spec.cmake
+++ b/
zypper.spec.cmake
@@
-11,7
+11,7
@@
# norootforbuild
Name: @PACKAGE@
-BuildRequires: libzypp-devel >= 9.
5
.0
+BuildRequires: libzypp-devel >= 9.
8
.0
BuildRequires: boost-devel >= 1.33.1
BuildRequires: gettext-devel >= 0.15
BuildRequires: readline-devel >= 5.1