Attachment 148268 Details for Bug 226976 – Use the correct types for entity values

[patch] Use the correct types for entity values

s-c-u.patch (text/plain), 3.62 KB, created by Miloslav Trmač on 2007-02-17 13:56:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miloslav Trmač

Created: 2007-02-17 13:56:58 UTC

Size: 3.62 KB

patch

obsolete

>Index: src/userProperties.py
>===================================================================
>RCS file: /usr/local/CVS/redhat-config-users/src/userProperties.py,v
>retrieving revision 1.87
>diff -u -r1.87 userProperties.py
>--- src/userProperties.py	5 Feb 2007 11:19:22 -0000	1.87
>+++ src/userProperties.py	17 Feb 2007 11:49:03 -0000
>@@ -459,13 +459,13 @@
>             fraction, integer = math.modf(daysTillExpire)
> 
>             if fraction == 0.0:
>-                daysTillExpire = str(int(tmp/seconds)-1)
>+                daysTillExpire = int(tmp/seconds)-1
>             else:
>-                daysTillExpire = str(int(tmp/seconds))
>+                daysTillExpire = int(tmp/seconds)
> 
>             self.userEnt.set(libuser.SHADOWEXPIRE, daysTillExpire)
>         else:
>-            self.userEnt.set(libuser.SHADOWEXPIRE, "-1")
>+            self.userEnt.set(libuser.SHADOWEXPIRE, -1)
> 
>         if self.pwExpireCheck.get_active():
>             allowed = string.strip(self.pwAllowEntry.get_text())
>@@ -509,16 +509,17 @@
>                 self.pwInactiveEntry.grab_focus()
>                 return
> 
>-            self.userEnt.set(libuser.SHADOWMIN, allowed)
>-            self.userEnt.set(libuser.SHADOWMAX, required)
>-            self.userEnt.set(libuser.SHADOWWARNING, warning)
>-            self.userEnt.set(libuser.SHADOWINACTIVE, inactive)
>-            
>+            # FIXME: report to the user instead of raising an exception if the
>+            # field is not numeric
>+            self.userEnt.set(libuser.SHADOWMIN, int(allowed))
>+            self.userEnt.set(libuser.SHADOWMAX, int(required))
>+            self.userEnt.set(libuser.SHADOWWARNING, int(warning))
>+            self.userEnt.set(libuser.SHADOWINACTIVE, int(inactive))
>         else:
>-            self.userEnt.set(libuser.SHADOWMIN, '0')
>-            self.userEnt.set(libuser.SHADOWMAX, '99999')
>-            self.userEnt.set(libuser.SHADOWWARNING, '7')
>-            self.userEnt.set(libuser.SHADOWINACTIVE, '-1')
>+            self.userEnt.set(libuser.SHADOWMIN, 0)
>+            self.userEnt.set(libuser.SHADOWMAX, 99999)
>+            self.userEnt.set(libuser.SHADOWWARNING, 7)
>+            self.userEnt.set(libuser.SHADOWINACTIVE, -1)
> 
>         self.parent.ADMIN.modifyUser(self.userEnt)
> 
>Index: src/userWindow.py
>===================================================================
>RCS file: /usr/local/CVS/redhat-config-users/src/userWindow.py,v
>retrieving revision 1.83
>diff -u -r1.83 userWindow.py
>--- src/userWindow.py	5 Feb 2007 11:19:22 -0000	1.83
>+++ src/userWindow.py	17 Feb 2007 11:49:03 -0000
>@@ -244,9 +244,9 @@
>         userEnt.set(libuser.GECOS, [fullName])
>         # Don't set if there are defaults
>         if not len (userEnt.get (libuser.SHADOWMIN)):
>-            userEnt.set(libuser.SHADOWMIN, '0')
>+            userEnt.set(libuser.SHADOWMIN, 0)
>         if not len (userEnt.get (libuser.SHADOWMAX)):
>-            userEnt.set(libuser.SHADOWMAX, '99999')
>+            userEnt.set(libuser.SHADOWMAX, 99999)
> 
>         if self.homeDirCheck.get_active():
>             userEnt.set(libuser.HOMEDIRECTORY, [homeDir])
>@@ -388,11 +388,11 @@
>         if groupEnt == None:
>             #The 'users' doesn't exist.  Let's create one
>             groupEnt = self.parent.ADMIN.initGroup('users')
>-            groupEnt.set(libuser.GIDNUMBER, "100")
>+            groupEnt.set(libuser.GIDNUMBER, 100)
>             self.parent.ADMIN.addGroup(groupEnt)
>-                                                                                
>+
>         cn = groupEnt.get(libuser.GROUPNAME)[0]
>- 
>+
>         # try to get a name to associate with the user's primary gid,
>         # and attempt to minimize lookups by caching answers
>         try:

Actions: View | Diff

Attachments on bug 226976: 148268