diff options
| author | Lori Alt <lori.alt@oracle.com> | 2010-07-29 15:41:34 -0600 |
|---|---|---|
| committer | Lori Alt <lori.alt@oracle.com> | 2010-07-29 15:41:34 -0600 |
| commit | 6d52f363e3b2c0c5da672c5b8c8adec99d345f38 (patch) | |
| tree | 34084a44295bde37b9d0a35fa8efecea6f4fd2bb /usr/src/cmd/pyzfs | |
| parent | e57ece5b0297b7f73b98eb54349e9eaea4fbd619 (diff) | |
| download | illumos-joyent-6d52f363e3b2c0c5da672c5b8c8adec99d345f38.tar.gz | |
6908227 pyzfs needs to move to python 2.6
Diffstat (limited to 'usr/src/cmd/pyzfs')
| -rw-r--r-- | usr/src/cmd/pyzfs/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/pyzfs/pyzfs.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/cmd/pyzfs/Makefile b/usr/src/cmd/pyzfs/Makefile index 062a97b019..65d3594902 100644 --- a/usr/src/cmd/pyzfs/Makefile +++ b/usr/src/cmd/pyzfs/Makefile @@ -19,8 +19,7 @@ # CDDL HEADER END # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # include ../Makefile.cmd @@ -31,6 +30,7 @@ PYSRCS= pyzfs.py PYOBJS= $(PYSRCS:%.py=%.pyc) PYFILES= $(PYSRCS) $(PYOBJS) POFILE= pyzfs.po +PYTHON= $(PYTHON_26) ROOTLIBZFSFILES= $(PYFILES:%=$(ROOTLIB)/zfs/%) diff --git a/usr/src/cmd/pyzfs/pyzfs.py b/usr/src/cmd/pyzfs/pyzfs.py index 973ffc4dc1..2088993d6d 100644 --- a/usr/src/cmd/pyzfs/pyzfs.py +++ b/usr/src/cmd/pyzfs/pyzfs.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2.4 -S +#! /usr/bin/python2.6 -S # # CDDL HEADER START # @@ -19,8 +19,7 @@ # # CDDL HEADER END # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # Note, we want SIGINT (control-c) to exit the process quietly, to mimic |