Bugfixing

diff --git a/lib/pp_admintools/app/remove_ldap_user.py b/lib/pp_admintools/app/remove_ldap_user.py
index 68a1b66b5992a7ab3b9367215bdaa46414dcaa5e..23adbbc991d13520dfdf2f4b0ad46338f33327f3 100644 (file)
--- a/lib/pp_admintools/app/remove_ldap_user.py
+++ b/lib/pp_admintools/app/remove_ldap_user.py
@@ -24,7 +24,7 @@ from ..xlate import XLATOR
 from .ldap import LdapAppError, FatalLDAPError
 from .ldap import BaseLdapApplication
 
-__version__ = '0.5.4'
+__version__ = '0.5.5'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -239,7 +239,7 @@ class RemoveLdapUserApplication(BaseLdapApplication):
     # -------------------------------------------------------------------------
     def request_for_remove(self):
 
-        if self.yes or self.quiet:
+        if self.quiet:
             return True
 
         print()

diff --git a/lib/pp_admintools/app/set_ldap_password.py b/lib/pp_admintools/app/set_ldap_password.py
index 0b2009aace5ae11db4f4af2ca97823632b271105..dec44c2cf77b9b7d0f783b74cab96fdbf799ea50 100644 (file)
--- a/lib/pp_admintools/app/set_ldap_password.py
+++ b/lib/pp_admintools/app/set_ldap_password.py
@@ -36,7 +36,7 @@ from .ldap import LdapAppError, FatalLDAPError
 from .ldap import BaseLdapApplication
 from .ldap import PasswordFileOptionAction
 
-__version__ = '0.6.3'
+__version__ = '0.6.4'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -581,12 +581,8 @@ class SetLdapPasswordApplication(BaseLdapApplication):
         print()
         msg = _("Apply new password? [{yes}/{no}]?").format(
             yes=self.colored(_('yes'), 'RED'), no=self.colored(_('No'), 'GREEN')) + ' '
-        do_set_passwd = False
-        if self.yes:
-            do_set_passwd = True
-        else:
-            do_set_passwd = self.ask_for_yes_or_no(msg, default_on_empty=False)
-            print()
+        do_set_passwd = self.ask_for_yes_or_no(msg, default_on_empty=False)
+        print()
 
         if not do_set_passwd:
             msg = _("Do not setting password for {!r}.").format(self.user_dn)