# HG changeset patch # User k128568 # Date 1392043672 36000 # Node ID 07ef2fc111a23553b415a300753021a86cc58e8d # Parent 7b4cdb0c9a994e1f0c309ee36eccf6d8ddf0af78 allow other faculties' students. diff -r 7b4cdb0c9a99 -r 07ef2fc111a2 newvm.py --- a/newvm.py Mon Feb 10 04:30:48 2014 -1000 +++ b/newvm.py Mon Feb 10 04:47:52 2014 -1000 @@ -14,7 +14,7 @@ # teachers/kono/01 # bad name returns 1 def ie_check_name(name): - m=re.match('^students/e(\d\d)/e(\d\d)57\d\d/0[1-4]$',name) + m=re.match('^students/e(\d\d)/e(\d\d)5\d\d\d/0[1-4]$',name) if m is not None: if m.group(1)==m.group(2): return 0 @@ -22,8 +22,6 @@ return 1 elif re.match('^teachers/[-a-z0-9]+/0[1-4]$',name): return 0 - elif re.match('^(taiki)/0[1-4]$',name): - return 0 else: return 1 @@ -37,11 +35,9 @@ os.makedirs(name); def ie_mkdir(name): - m=re.match('^(students/e\d\d/e\d\d57\d\d)/0[1-4]$',name) + m=re.match('^(students/e\d\d/e\d\d5\d\d\d)/0[1-4]$',name) if m is None: m=re.match('^(teachers/[-a-z0-9]+)/0[1-4]$',name) - if m is None: - m=re.match('(taiki)/0[1-4]',name) if m is not None: dir=m.group(1) ie_mkdir1('/media/fcs/'+dir)