equal
deleted
inserted
replaced
108 elif o == "-c": |
108 elif o == "-c": |
109 wampconf = None if a == "off" else a |
109 wampconf = None if a == "off" else a |
110 elif o == "-s": |
110 elif o == "-s": |
111 wampsecret = None if a == "off" else a |
111 wampsecret = None if a == "off" else a |
112 elif o == "-e": |
112 elif o == "-e": |
113 extensions.append(a) |
113 l = os.path.split(os.path.realpath(a)) |
|
114 l.reverse() |
|
115 extensions.append(l) |
114 else: |
116 else: |
115 usage() |
117 usage() |
116 sys.exit() |
118 sys.exit() |
117 |
119 |
118 |
120 |
586 except Exception, e: |
588 except Exception, e: |
587 print(_("WAMP import failed :"), e) |
589 print(_("WAMP import failed :"), e) |
588 wampconf = None |
590 wampconf = None |
589 |
591 |
590 # Load extensions |
592 # Load extensions |
591 for extfilename in extensions: |
593 for extention_file, extension_folder in extensions: |
592 extension_folder = os.path.split(os.path.realpath(extfilename))[0] |
|
593 sys.path.append(extension_folder) |
594 sys.path.append(extension_folder) |
594 execfile(extfilename, locals()) |
595 execfile(os.path.join(extension_folder, extention_file), locals()) |
595 |
596 |
596 if havetwisted: |
597 if havetwisted: |
597 if webport is not None: |
598 if webport is not None: |
598 try: |
599 try: |
599 website = NS.RegisterWebsite(webport) |
600 website = NS.RegisterWebsite(webport) |