|
|
|
@ -164,7 +164,7 @@ class install_cmd(share_cmd):
|
|
|
|
|
self.optobj.error(_("need specify disk by '-d' option"))
|
|
|
|
|
# check syntax DISK:DIR:FS:'Do I need to format the disk'
|
|
|
|
|
if values.d:
|
|
|
|
|
reTrueDisk = re.compile("^[^:]+(:[^:]+){0,3}$")
|
|
|
|
|
reTrueDisk = re.compile("^[^:]+(:[^:]*){0,3}$")
|
|
|
|
|
wrongValue = filter(lambda x: not reTrueDisk.match(x),values.d)
|
|
|
|
|
if wrongValue:
|
|
|
|
|
self.optobj.error(_("option %s:") %"d" +\
|
|
|
|
@ -316,7 +316,7 @@ class install_cmd(share_cmd):
|
|
|
|
|
listNameOptions = ["dev","mountPoint","fileSystem","options"]
|
|
|
|
|
lenOptions = len(listNameOptions)
|
|
|
|
|
itemOptions = map(lambda x: (x,''), listNameOptions)
|
|
|
|
|
rawListOpt = map(lambda x: filter(lambda y: y, x.split(':')), listOpt)
|
|
|
|
|
rawListOpt = map(lambda x: x.split(':'), listOpt)
|
|
|
|
|
sameLenListOpt = []
|
|
|
|
|
for listData in rawListOpt:
|
|
|
|
|
lenListData = len(listData)
|
|
|
|
|