summaryrefslogtreecommitdiffstats
path: root/iscsi.py
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2008-11-11 15:50:08 +0100
committerHans de Goede <hdegoede@redhat.com>2008-11-11 22:34:48 +0100
commitfeb6f9f7d508e36c57d9a1bb28727217e28472ef (patch)
treebf4b8cc04c40ae49890468a2c2177814c291b54b /iscsi.py
parent2063357f821cd9700ec8c3c932b4a019fec8881e (diff)
downloadanaconda-feb6f9f7d508e36c57d9a1bb28727217e28472ef.tar.gz
anaconda-feb6f9f7d508e36c57d9a1bb28727217e28472ef.tar.xz
anaconda-feb6f9f7d508e36c57d9a1bb28727217e28472ef.zip
iscsi do missing value check only once
Currently the iscsi code checks for giving a password but not a username or vica versa in both the interface and the iscsi code, this patch removes the unneeded check from the interface code, this is a preparation patch for fixing #463156, #461830
Diffstat (limited to 'iscsi.py')
-rw-r--r--iscsi.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/iscsi.py b/iscsi.py
index 6ff69f10b..ec36b0988 100644
--- a/iscsi.py
+++ b/iscsi.py
@@ -479,16 +479,16 @@ class iscsi(object):
if user is not None or pw is not None:
commentUser = ''
if user is None:
- raise ValueError, "user is required"
+ raise ValueError, _("CHAP username is required if CHAP password is defined.")
if pw is None:
- raise ValueError, "pw is required"
+ raise ValueError, _("CHAP password is required if CHAP username is defined.")
if user_in is not None or pw_in is not None:
commentUser_in = ''
if user_in is None:
- raise ValueError, "user_in is required"
+ raise ValueError, _("Reverse CHAP username is required if reverse CHAP password is defined.")
if pw_in is None:
- raise ValueError, "pw_in is required"
+ raise ValueError, _("Reverse CHAP password is required if reverse CHAP username is defined.")
# If either a user/pw pair was specified or a user_in/pw_in was
# specified, then CHAP is specified.