--- a/src/client.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/client.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/depot.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/depot.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/__init__.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/__init__.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/__init__.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/__init__.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/attribute.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/attribute.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/actions/depend.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/depend.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/directory.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/directory.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/driver.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/driver.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/actions/file.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/file.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/generic.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/generic.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/group.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/group.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/hardlink.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/hardlink.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/actions/legacy.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/legacy.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/license.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/license.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/link.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/link.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/actions/unknown.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/unknown.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/actions/user.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/actions/user.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/bundle/SolarisPackageDatastreamBundle.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/bundle/SolarisPackageDatastreamBundle.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/bundle/SolarisPackageDirBundle.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/bundle/SolarisPackageDirBundle.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/bundle/TarBundle.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/bundle/TarBundle.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/bundle/__init__.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/bundle/__init__.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/catalog.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/catalog.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/cfgfiles.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/cfgfiles.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/__init__.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/__init__.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/client/bootenv.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/bootenv.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/filelist.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/filelist.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/filter.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/filter.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/image.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/image.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/imageconfig.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/imageconfig.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/imageplan.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/imageplan.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/imagetypes.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/imagetypes.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/pkgplan.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/pkgplan.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/progress.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/progress.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/client/retrieve.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/client/retrieve.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/config.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/config.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/cpiofile.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/cpiofile.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 # -*- coding: iso-8859-1 -*-
 #
 # Copyright (C) 2002 Lars Gustäbel <[email protected]>
@@ -29,7 +29,7 @@
 """
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/dependency.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/dependency.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/depotcontroller.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/depotcontroller.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/fmri.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/fmri.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/manifest.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/manifest.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/misc.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/misc.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/pkgtarfile.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/pkgtarfile.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/__init__.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/portable/__init__.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/os_darwin.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/portable/os_darwin.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/os_sunos.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/portable/os_sunos.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/os_unix.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/portable/os_unix.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/os_windows.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/portable/os_windows.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/portable/util.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/portable/util.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/publish/__init__.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/publish/__init__.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/publish/transaction.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/publish/transaction.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/__init__.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/server/__init__.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/config.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/server/config.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/depot.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/server/depot.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # copyright (c) 2004-2007, cherrypy team ([email protected])
 # all rights reserved.

--- a/src/modules/server/face.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/server/face.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/repository.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/server/repository.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/server/transaction.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/server/transaction.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/smf.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/smf.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 import xml.dom.minidom as minidom

--- a/src/modules/subprocess_method.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/subprocess_method.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # Originally licensed by Peter Atrand to PSF under a Contributor Agreement.
 # See http://www.python.org/2.4/license for licensing details.
@@ -7,7 +7,7 @@
 #
 # Copyright (c) 2003-2005 by Peter Astrand <[email protected]>
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 

--- a/src/modules/sysvpkg.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/sysvpkg.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 

--- a/src/modules/updatelog.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/updatelog.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/modules/version.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/modules/version.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/publish.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/publish.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/pull.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/pull.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/setup.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/setup.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,3 +1,4 @@
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/actionbench.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/actionbench.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api-complete.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api-complete.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -14,8 +14,8 @@
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[[]]" replaced with your own identifying
-# information: Portions Copyright [[yyyy]] [name of copyright owner]
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #

--- a/src/tests/api/__init__.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/__init__.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_action.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_action.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_catalog.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_catalog.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_elf.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_elf.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -14,13 +14,13 @@
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[[]]" replaced with your own identifying
-# information: Portions Copyright [[yyyy]] [name of copyright owner]
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 import pkg.elf as elf

--- a/src/tests/api/t_filter.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_filter.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_fmri.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_fmri.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -20,7 +20,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 import unittest

--- a/src/tests/api/t_imageconfig.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_imageconfig.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_manifest.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_manifest.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_misc.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_misc.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_pkgtarfile.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_pkgtarfile.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_plat.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_plat.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,5 +1,4 @@
-
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_smf.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_smf.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/api/t_version.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/api/t_version.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,5 +1,4 @@
-
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -21,7 +20,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 import unittest

--- a/src/tests/cli-complete.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli-complete.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -14,8 +14,8 @@
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[[]]" replaced with your own identifying
-# information: Portions Copyright [[yyyy]] [name of copyright owner]
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #

--- a/src/tests/cli/__init__.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/__init__.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_actions.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_actions.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_circular_dependencies.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_circular_dependencies.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_commandline.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_commandline.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_depot.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_depot.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_depotcontroller.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_depotcontroller.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_image_create.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_image_create.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_install_basics.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_pkg_install_basics.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_install_corrupt_image.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_pkg_install_corrupt_image.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkg_list.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_pkg_list.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_pkgsend.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_pkgsend.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_recv.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_recv.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_rename.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_rename.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_twodepot.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_twodepot.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/t_upgrade.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/t_upgrade.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/cli/testutils.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/cli/testutils.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/tests/multiplatform.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/tests/multiplatform.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,3 +1,4 @@
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/clustertoc2import.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/util/distro-import/clustertoc2import.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 # turns a single input argument which is the path to a Solaris

--- a/src/util/distro-import/driver_names.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/util/distro-import/driver_names.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/get_file_from_pkg.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/util/distro-import/get_file_from_pkg.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 #

--- a/src/util/distro-import/package_names.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/util/distro-import/package_names.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #

--- a/src/util/distro-import/pkg-gen.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/util/distro-import/pkg-gen.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 

--- a/src/util/distro-import/solaris.py	Fri Jun 27 16:19:40 2008 -0700
+++ b/src/util/distro-import/solaris.py	Sat Jun 28 18:54:10 2008 -0500
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.4
 #
 # CDDL HEADER START
 #
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.