[bugs on netconfig_dialog.py]Re: PATCH:CIDR prefix on netconfig_dialog.py

[HARA Hiroshi <hhara miraclelinux com>]

hi,

I'm sorry for sending many times about it.

I found another bugs on netconfig_dialog.py

HARA Hiroshi wrote:
> hi,
> 
> I found spelling mistake.
> 
> would you check the attached patch, please?
> 
> HARA Hiroshi wrote:
>> Hi,
>>
>> Did you forget to remove these lines?
>> It seems that if these lines is not removed,
>> CIDR prefix can not be recognized .
>>
>> would you check attached patch, please?
>>
>>
>> ------------------------------------------------------------------------
>>
>> _______________________________________________
>> Anaconda-devel-list mailing list
>> Anaconda-devel-list redhat com
>> https://www.redhat.com/mailman/listinfo/anaconda-devel-list
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list redhat com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

diff -u -r1.13 netconfig_dialog.py
--- iw/netconfig_dialog.py      25 Jun 2007 14:16:13 -0000      1.13
+++ iw/netconfig_dialog.py      3 Jul 2007 11:03:57 -0000
@@ -188,22 +188,12 @@
                 network.sanityCheckIPString(ipv4addr)
                 netdev.set(('ipaddr', ipv4addr))
             except network.IPMissing, msg:
-                self._handleIPMissing(_("IP Address"), msg)
+                self._handleIPMissing(_("IP Address"))
                 return
             except network.IPError, msg:
                 self._handleIPError(_("IP Address"), msg)
                 return

-            try:
-                network.sanityCheckIPString(ipv4nm)
-                netdev.set(('netmask', ipv4nm))
-            except network.IPMissing, msg:
-                self._handleIPMissing(_("Netmask"), msg)
-                return
-            except network.IPError, msg:
-                self._handleIPError(_("Netmask"), msg)
-                return
-
             if ipv4nm.find('.') == -1:
                 # user provided a CIDR prefix
                 try:
@@ -213,17 +203,17 @@
                         return
                     else:
                         ipv4nm = isys.prefix2netmask(int(ipv4nm))
-                        netdev.sef(('netmask', ipv4nm))
+                        netdev.set(('netmask', ipv4nm))
                 except:
-                    self._handleIPMissing(_("IPv4 Network Mask"), msg)
+                    self._handleIPMissing(_("IPv4 Network Mask"))
                     return
             else:
                 # user provided a dotted-quad netmask
                 try:
                     network.sanityCheckIPString(ipv4nm)
-                    netdev.sef(('netmask', ipv4nm))
+                    netdev.set(('netmask', ipv4nm))
                 except network.IPMissing, msg:
-                    self._handleIPMissing(_("IPv4 Network Mask"), msg)
+                    self._handleIPMissing(_("IPv4 Network Mask"))
                     return
                 except network.IPError, msg:
                     self._handleIPError(_("IPv4 Network Mask"), msg)
@@ -232,7 +222,7 @@
             try:
                 network.sanityCheckIPString(gateway)
             except network.IPMissing, msg:
-                self._handleIPMissing(_("Gateway"), msg)
+                self._handleIPMissing(_("Gateway"))
                 return
             except network.IPError, msg:
                 self._handleIPError(_("Gateway"), msg)