[Da-tools-commits] ./debian/userdir-ldap r497: Adjust boolean value detection code to use upper case letters in the

[Joey Schulze]

------------------------------------------------------------
revno: 497
committer: Joey Schulze <joey at infodrom.org>
branch nick: userdir-ldap
timestamp: Sun 2008-12-14 02:56:40 +0100
message:
  Adjust boolean value detection code to use upper case letters in the
  end.  Enable it for all three boolean attributes.  Widen tabular
  display by one character so the description fits again.  Finalise new
  changelog entry.
modified:
  debian/changelog
  ud-info
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-12-14 01:25:00 +0000
+++ b/debian/changelog	2008-12-14 01:56:40 +0000
@@ -1,3 +1,14 @@
+userdir-ldap (0.3.55) unstable; urgency=low
+
+  [ Joey Schulze ]
+  * Adjust boolean value detection code to use upper case letters in the
+    end.  Enable it for all three boolean attributes.  Widen tabular
+    display by one character so the description fits again.
+  [ Martin Zobel-Helas ]
+  * Copy new mailSpamOptOut to debianDeveloper accounts as well 
+
+ -- Joey Schulze <joey at infodrom.org>  Sun, 14 Dec 2008 02:55:41 +0100
+
 userdir-ldap (0.3.54) unstable; urgency=low
 
   [ Martin Zobel-Helas ]

=== modified file 'ud-info'
--- a/ud-info	2008-12-14 01:12:28 +0000
+++ b/ud-info	2008-12-14 01:56:40 +0000
@@ -219,7 +219,7 @@
    Keys.sort();
    for at in Keys:
       if at < 100 or RootMode != 0:
-         print " %3u) %-18s: " % (at,OrderedIndex[at][0]),
+         print " %3u) %-19s: " % (at,OrderedIndex[at][0]),
          for x in OrderedIndex[at][1]:
             print "'%s'" % (re.sub('[\n\r]','?',x)),
          print;
@@ -252,13 +252,15 @@
       Attrs[1][Attr] = [""];
       return;
 
-   if (Attr == "mailSpamOptOut" and NewValue != "true" and NewValue != "false"):
-      if (NewValue == "1"): NewValue = "true"
-      else:
-         if (NewValue == "0"): NewValue = "false"
+   if (Attr == "mailSpamOptOut" or Attr == "mailGreylisting" or Attr == "mailCallout"):
+      if (NewValue.lower() != "true" and NewValue.lower() != "false"):
+         if (NewValue == "1"): NewValue = "true"
          else:
-            print "Need a boolean value"
-            return
+            if (NewValue == "0"): NewValue = "false"
+            else:
+               print "Need a boolean value"
+               return
+      NewValue = NewValue.upper()
 
    # Set a new value
    print "Setting.",;