ref: refs/heads/ma-misc
commit dc9f8ae6b767db38b1b237ac06d454cd0ec98f52
Author: Michael Andres
Date: Thu Oct 29 14:35:47 2009 +0100
Selectable: Don't unlock when setting fate to UNMODIFIED.
---
zypp/ui/Selectable.cc | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/zypp/ui/Selectable.cc b/zypp/ui/Selectable.cc
index 2f2cba0..d6e8858 100644
--- 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;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
Michael Andres