[Python-checkins] CVS: python/dist/src/Tools/freeze freeze.py,1.34,1.35

Guido van Rossum python-dev@python.org
Fri, 5 May 2000 23:18:10 -0400 (EDT)


Update of /projects/cvsroot/python/dist/src/Tools/freeze
In directory eric:/projects/python/develop/guido/src/Tools/freeze

Modified Files:
	freeze.py 
Log Message:
Toby Dickenson:

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

(Blessed by MarkH)


Index: freeze.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/freeze/freeze.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** freeze.py	2000/03/23 18:13:10	1.34
--- freeze.py	2000/05/06 03:18:08	1.35
***************
*** 336,343 ****
          mf.run_script(scriptfile)
      else:
!         if modargs:
!             mf.import_hook(scriptfile)
!         else:
!             mf.load_file(scriptfile)
  
      if debug > 0:
--- 336,340 ----
          mf.run_script(scriptfile)
      else:
!         mf.load_file(scriptfile)
  
      if debug > 0: