20440888 Userland python tools should migrate to 2.7 s11-update
authorJohn Beck <John.Beck@Oracle.COM>
Tue, 10 Feb 2015 14:10:51 -0800
branchs11-update
changeset 3979 46744fa00de4
parent 3978 adf3ab1a234a
child 3980 a5c4d6759ee0
20440888 Userland python tools should migrate to 2.7
components/ruby/puppet/files/update_smf.py
make-rules/build-zone.mk
make-rules/depend.mk
tools/bass-o-matic
tools/build-watch.d
tools/build-watch.pl
tools/gen-components
tools/time.c
tools/userland-fetch
tools/userland-unpack
--- a/components/ruby/puppet/files/update_smf.py	Mon Mar 16 13:00:40 2015 -0700
+++ b/components/ruby/puppet/files/update_smf.py	Tue Feb 10 14:10:51 2015 -0800
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python2.7
 #
 # CDDL HEADER START
 #
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 '''
--- a/make-rules/build-zone.mk	Mon Mar 16 13:00:40 2015 -0700
+++ b/make-rules/build-zone.mk	Tue Feb 10 14:10:51 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
--- a/make-rules/depend.mk	Mon Mar 16 13:00:40 2015 -0700
+++ b/make-rules/depend.mk	Tue Feb 10 14:10:51 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 DEPENDS +=	$(REQUIRED_TOOL)
--- a/tools/bass-o-matic	Mon Mar 16 13:00:40 2015 -0700
+++ b/tools/bass-o-matic	Tue Feb 10 14:10:51 2015 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
 #
 # CDDL HEADER START
 #
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # bass-o-matic.py
--- a/tools/build-watch.d	Mon Mar 16 13:00:40 2015 -0700
+++ b/tools/build-watch.d	Tue Feb 10 14:10:51 2015 -0800
@@ -19,7 +19,7 @@
  *
  * CDDL HEADER END
  *
- * Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  *
  *
  * build-watch.d - a simple dtrace script to keep track of some key
--- a/tools/build-watch.pl	Mon Mar 16 13:00:40 2015 -0700
+++ b/tools/build-watch.pl	Tue Feb 10 14:10:51 2015 -0800
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # build-watch.pl - a simple utility to watch a process and it's children under
--- a/tools/gen-components	Mon Mar 16 13:00:40 2015 -0700
+++ b/tools/gen-components	Tue Feb 10 14:10:51 2015 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2.7
 #
 # CDDL HEADER START
 #
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2015, Oracle and/or it's affiliates.  All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # gen_components
--- a/tools/time.c	Mon Mar 16 13:00:40 2015 -0700
+++ b/tools/time.c	Tue Feb 10 14:10:51 2015 -0800
@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
--- a/tools/userland-fetch	Mon Mar 16 13:00:40 2015 -0700
+++ b/tools/userland-fetch	Tue Feb 10 14:10:51 2015 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
 #
 # CDDL HEADER START
 #
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # fetch.py - a file download utility
--- a/tools/userland-unpack	Mon Mar 16 13:00:40 2015 -0700
+++ b/tools/userland-unpack	Tue Feb 10 14:10:51 2015 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.6
+#!/usr/bin/python2.7
 #
 # CDDL HEADER START
 #
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # unpack.py - an archive unpack utility