[Da-tools-commits] ./debian/userdir-ldap r434: ud-info: Change the "retired" status to "inactive". inactive covers memorial, removed, expelled more clearly.

[Peter Palfrader]

------------------------------------------------------------
revno: 434
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Tue 2008-07-08 10:34:53 +0200
message:
  ud-info: Change the "retired" status to "inactive".  inactive covers memorial, removed, expelled more clearly.
modified:
  debian/changelog
  ud-info
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-07-08 07:44:46 +0000
+++ b/debian/changelog	2008-07-08 08:34:53 +0000
@@ -4,8 +4,10 @@
     we were missing prompt information so we got a backtrace.
   * ud-info: Warn when we don't have a prompt string for
     attributes on startup.
+  * ud-info: Change the "retired" status to "inactive".
+    inactive covers memorial, removed, expelled more clearly.
 
- -- Peter Palfrader <weasel at debian.org>  Tue, 08 Jul 2008 09:44:39 +0200
+ -- Peter Palfrader <weasel at debian.org>  Tue, 08 Jul 2008 10:33:51 +0200
 
 userdir-ldap (0.3.33) unstable; urgency=low
 

=== modified file 'ud-info'
--- a/ud-info	2008-07-08 07:44:46 +0000
+++ b/ud-info	2008-07-08 08:34:53 +0000
@@ -444,7 +444,7 @@
 
       print "Set account to:"
       print "  1) retiring (lock account but do not disable mail):"
-      print "  2) retired (lock account and disable mail):"
+      print "  2) inactive (removed/emeritus/... - lock account and disable mail):"
       print "  3) memorial (lock account and disable mail):"
       print "  4) active (do not change other settings, you will have to deal with them)"
       print "  q) return (no change)"
@@ -454,7 +454,7 @@
          if Resp == "1":
            newstatus = "retiring %s"%(time.strftime("%Y-%m-%d"))
          else:
-           newstatus = "retired %s"%(time.strftime("%Y-%m-%d"))
+           newstatus = "inactive %s"%(time.strftime("%Y-%m-%d"))
          l.modify_s(UserDn,[(ldap.MOD_REPLACE,"accountStatus",newstatus)])
          Attrs[0][1]["accountStatus"] = [newstatus]