[Jython-checkins] CVS: jython/Tools/jythonc main.py,2.12,2.13

[Samuele P. <ped...@us...>]

Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv27667

Modified Files:
	main.py 
Log Message:
Fix duplicate errors producing jars when both --all and --core are specified.
Note: --all takes over --core.


Index: main.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/main.py,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** main.py	2000/11/17 12:44:21	2.12
--- main.py	2001/06/27 13:47:12	2.13
***************
*** 268,275 ****
      extraPackages = []
  
-     if opts.core:
-         addCore(extraPackages)
      if opts.all:
          addAll(extraPackages)
  
      ja = JavaArchive(extraPackages)
--- 268,275 ----
      extraPackages = []
  
      if opts.all:
          addAll(extraPackages)
+     elif opts.core:
+         addCore(extraPackages)
  
      ja = JavaArchive(extraPackages)