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:
1606b99
)
Selectable: Don't unlock when setting fate to UNMODIFIED.
author
Michael Andres
<ma@suse.de>
Thu, 29 Oct 2009 13:35:47 +0000
(14:35 +0100)
committer
Michael Andres
<ma@suse.de>
Thu, 29 Oct 2009 13:35:47 +0000
(14:35 +0100)
zypp/ui/Selectable.cc
patch
|
blob
|
history
diff --git
a/zypp/ui/Selectable.cc
b/zypp/ui/Selectable.cc
index
2f2cba0
..
d6e8858
100644
(file)
--- a/
zypp/ui/Selectable.cc
+++ b/
zypp/ui/Selectable.cc
@@
-186,7
+186,15
@@
namespace zypp
break;
case UNMODIFIED:
- return setStatus( hasInstalledObj() ? S_KeepInstalled : S_NoInst, causer_r );
+ switch ( status() ) {
+ case S_Protected:
+ case S_Taboo:
+ return true;
+ break;
+ default:
+ return setStatus( hasInstalledObj() ? S_KeepInstalled : S_NoInst, causer_r );
+ break;
+ }
break;
}
return false;