projects
/
platform
/
upstream
/
libzypp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2c34174
)
fix isSoftLocked computation
author
Michael Andres
<ma@suse.de>
Thu, 5 Jul 2012 13:47:52 +0000
(15:47 +0200)
committer
Michael Andres
<ma@suse.de>
Thu, 5 Jul 2012 13:47:52 +0000
(15:47 +0200)
zypp/ResStatus.h
patch
|
blob
|
history
diff --git
a/zypp/ResStatus.h
b/zypp/ResStatus.h
index
db3e97f
..
0724fe3
100644
(file)
--- a/
zypp/ResStatus.h
+++ b/
zypp/ResStatus.h
@@
-255,8
+255,8
@@
namespace zypp
bool isUserLocked() const
{ return isLocked() && isByUser(); }
- bool isSoftLocked(
TransactByValue causer_r = USER
) const
- { return isKept() &&
fieldValueIs<TransactByField>( causer_r
); }
+ bool isSoftLocked() const
+ { return isKept() &&
( isByApplLow() || isByUser()
); }
bool isKept() const
{ return fieldValueIs<TransactField>( KEEP_STATE ); }