Attachment 91549 Details for Bug 88190 – moves form-fill to after is-expire-enabled check

[patch] moves form-fill to after is-expire-enabled check

fix99999bug.patch (text/plain), 2.38 KB, created by Matthew Miller on 2003-05-08 02:51:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Miller

Created: 2003-05-08 02:51:34 UTC

Size: 2.38 KB

patch

obsolete

>--- redhat-config-users-1.1.5/src/userProperties.py.orig	2003-05-07 22:38:57.000000000 -0400
>+++ redhat-config-users-1.1.5/src/userProperties.py	2003-05-07 22:45:23.000000000 -0400
>@@ -206,41 +206,30 @@
>                     self.accountExpireCheck.set_active(gtk.FALSE)
> 
>         min = self.userEnt.get(libuser.SHADOWMIN)
>-        if min:
>-            try:
>-                if int(min[0]) != -1:
>-                    self.pwExpireCheck.set_active(gtk.TRUE)
>-                    self.pwAllowEntry.set_text(str(min[0]))
>-            except:
>-                self.pwExpireCheck.set_active(gtk.FALSE)
>+        if min and int(min[0]) != -1:
>+            self.pwExpireCheck.set_active(gtk.TRUE)
> 
>         warning = self.userEnt.get(libuser.SHADOWWARNING)
>-        if warning:
>-            try:
>-                if int(warning[0]) != -1:
>-                    self.pwExpireCheck.set_active(gtk.TRUE)
>-                    self.pwWarnEntry.set_text(str(warning[0]))
>-            except:
>-                self.pwExpireCheck.set_active(gtk.FALSE)
>+        if warning and int(warning[0]) != -1:
>+            self.pwExpireCheck.set_active(gtk.TRUE)
> 
>         inactive = self.userEnt.get(libuser.SHADOWINACTIVE)
>-        if inactive:
>-            try:
>-                if int(inactive[0]) != -1:
>-                    self.pwExpireCheck.set_active(gtk.TRUE)
>-                    self.pwInactiveEntry.set_text(str(inactive[0]))
>-            except:
>-                self.pwExpireCheck.set_active(gtk.FALSE)
>+        if inactive and int(inactive[0]) != -1:
>+            self.pwExpireCheck.set_active(gtk.TRUE)
> 
>         if self.parent.ADMIN.userIsLocked(self.userEnt) == 1:
>             self.accountLockCheck.set_active(gtk.TRUE)
> 
>         max = self.userEnt.get(libuser.SHADOWMAX)
>-        if max:
>+        if max and int(max[0]) != 99999:
>+            self.pwExpireCheck.set_active(gtk.TRUE)
>+
>+        if self.pwExpireCheck.get_active():
>             try:
>-                if int(max[0]) != 99999:
>-                    self.pwExpireCheck.set_active(gtk.TRUE)
>-                    self.pwRequireEntry.set_text(str(max[0]))
>+                self.pwAllowEntry.set_text(str(min[0]))
>+                self.pwWarnEntry.set_text(str(warning[0]))
>+                self.pwInactiveEntry.set_text(str(inactive[0]))
>+                self.pwRequireEntry.set_text(str(max[0]))
>             except:
>                 self.pwExpireCheck.set_active(gtk.FALSE)
>

Actions: View | Diff

Attachments on bug 88190: 91549