diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-06-20 03:04:48 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-06-20 03:04:48 +0000 |
| commit | 15146115d5c6e159f69c53d8336abc08f96dcb33 (patch) | |
| tree | 302a707186e42df15ad647ca01e10e9237cee46c | |
| parent | 541f29dffa6b7c3f5b9f2af6e9735a2a0b0d4476 (diff) | |
| download | anaconda-15146115d5c6e159f69c53d8336abc08f96dcb33.tar.gz anaconda-15146115d5c6e159f69c53d8336abc08f96dcb33.tar.xz anaconda-15146115d5c6e159f69c53d8336abc08f96dcb33.zip | |
clarify error message; can't have first octet be zero (I asked bryce) (#67042)
| -rw-r--r-- | iw/ipwidget.py | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/iw/ipwidget.py b/iw/ipwidget.py index d84c3ac14..416fa4aa1 100644 --- a/iw/ipwidget.py +++ b/iw/ipwidget.py @@ -102,19 +102,15 @@ class IPEditor: try: widget = self.entrys['entry1'] - if int(widget.get_text()) > 255: - raise IPError, (_("IP Addresses must contain numbers between 1 and 255"), widget) - widget = self.entrys['entry2'] - if int(widget.get_text()) > 255: - raise IPError, (_("IP Addresses must contain numbers between 1 and 255"), widget) - widget = self.entrys['entry3'] - if int(widget.get_text()) > 255: - raise IPError, (_("IP Addresses must contain numbers between 1 and 255"), widget) - widget = self.entrys['entry4'] - if int(widget.get_text()) > 255: - raise IPError, (_("IP Addresses must contain numbers between 1 and 255"), widget) + if int(widget.get_text()) > 255 or int(widget.get_text()) <= 0: + raise IPError, (_("IP Addresses must contain numbers between 1 and 255"), widget) + + for ent in ['entry2', 'entry3', 'entry4']: + widget = self.entrys[ent] + if int(widget.get_text()) > 255: + raise IPError, (_("IP Addresses must contain numbers between 0 and 255"), widget) except ValueError, msg: - raise IPError, (_("IP Addresses must contain numbers between 1 and 255"), widget) + raise IPError, (_("IP Addresses must contain numbers between 0 and 255"), widget) return self.entrys['entry1'].get_text() + "." + self.entrys['entry2'].get_text() + "." +self.entrys['entry3'].get_text() + "." +self.entrys['entry4'].get_text() |