Commit 4b1235cd authored by Guido van Rossum's avatar Guido van Rossum

Toby Dickenson:

Fix for problem with freeze when both "-m" and "-s service" options
are used.

(Blessed by MarkH)
parent dd8024eb
...@@ -335,10 +335,7 @@ def main(): ...@@ -335,10 +335,7 @@ def main():
if python_entry_is_main: if python_entry_is_main:
mf.run_script(scriptfile) mf.run_script(scriptfile)
else: else:
if modargs: mf.load_file(scriptfile)
mf.import_hook(scriptfile)
else:
mf.load_file(scriptfile)
if debug > 0: if debug > 0:
mf.report() mf.report()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment