[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Wed Mar 24 21:39:15 MDT 2010
The branch, master has been updated
via 088096d... python: use '#!/usr/bin/env python' to cope with varying install locations
from 845c228... Fix bug #7269 - Job management commands don't work for CUPS queues.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 088096d1bad51428a2e2d487214995d4fdfc7ccc
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Mar 24 16:50:50 2010 +1100
python: use '#!/usr/bin/env python' to cope with varying install locations
this should be much more portable
-----------------------------------------------------------------------
Summary of changes:
lib/subunit/python/subunit/run.py | 2 +-
lib/tdb/python/tdbdump.py | 2 +-
lib/tdb/python/tests/simple.py | 2 +-
source4/lib/ldb/tests/python/acl.py | 2 +-
source4/lib/ldb/tests/python/api.py | 2 +-
source4/lib/ldb/tests/python/deletetest.py | 2 +-
source4/lib/ldb/tests/python/ldap.py | 2 +-
source4/lib/ldb/tests/python/ldap_schema.py | 2 +-
source4/lib/ldb/tests/python/sec_descriptor.py | 2 +-
source4/lib/ldb/tests/python/urgent_replication.py | 2 +-
source4/lib/messaging/tests/bindings.py | 2 +-
source4/lib/registry/tests/bindings.py | 2 +-
source4/libcli/security/tests/bindings.py | 2 +-
source4/scripting/bin/autoidl | 2 +-
source4/scripting/bin/enablerecyclebin | 2 +-
source4/scripting/bin/fullschema | 2 +-
source4/scripting/bin/get-descriptors | 2 +-
source4/scripting/bin/machineaccountccache | 2 +-
source4/scripting/bin/minschema | 2 +-
source4/scripting/bin/rebuildextendeddn | 2 +-
source4/scripting/bin/rpcclient | 2 +-
source4/scripting/bin/samba3dump | 2 +-
source4/scripting/bin/samba_dnsupdate | 2 +-
source4/scripting/bin/smbstatus | 2 +-
source4/scripting/bin/subunitrun | 2 +-
source4/scripting/bin/upgradeprovision | 2 +-
source4/scripting/bin/w32err_code.py | 2 +-
source4/scripting/devel/ldapcmp | 2 +-
source4/setup/provision | 2 +-
source4/setup/upgrade_from_s3 | 2 +-
30 files changed, 30 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/subunit/python/subunit/run.py b/lib/subunit/python/subunit/run.py
index 01c0b0e..e57939f 100755
--- a/lib/subunit/python/subunit/run.py
+++ b/lib/subunit/python/subunit/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Simple subunit testrunner for python
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/lib/tdb/python/tdbdump.py b/lib/tdb/python/tdbdump.py
index d759d77..01859eb 100644
--- a/lib/tdb/python/tdbdump.py
+++ b/lib/tdb/python/tdbdump.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Trivial reimplementation of tdbdump in Python
import tdb, sys
diff --git a/lib/tdb/python/tests/simple.py b/lib/tdb/python/tests/simple.py
index c7443c0..1c5982b 100644
--- a/lib/tdb/python/tests/simple.py
+++ b/lib/tdb/python/tests/simple.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Some simple tests for the Python bindings for TDB
# Note that this tests the interface of the Python bindings
# It does not test tdb itself.
diff --git a/source4/lib/ldb/tests/python/acl.py b/source4/lib/ldb/tests/python/acl.py
index 0613689..e4c531a 100755
--- a/source4/lib/ldb/tests/python/acl.py
+++ b/source4/lib/ldb/tests/python/acl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This is unit with tests for LDAP access checks
diff --git a/source4/lib/ldb/tests/python/api.py b/source4/lib/ldb/tests/python/api.py
index 956908d..001739b 100755
--- a/source4/lib/ldb/tests/python/api.py
+++ b/source4/lib/ldb/tests/python/api.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Simple tests for the ldb python bindings.
# Copyright (C) 2007 Jelmer Vernooij <jelmer at samba.org>
diff --git a/source4/lib/ldb/tests/python/deletetest.py b/source4/lib/ldb/tests/python/deletetest.py
index 3fe28a3..13bec7e 100755
--- a/source4/lib/ldb/tests/python/deletetest.py
+++ b/source4/lib/ldb/tests/python/deletetest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
import getopt
diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index 6d01fcd..5e84030 100755
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This is a port of the original in testprogs/ejs/ldap.js
diff --git a/source4/lib/ldb/tests/python/ldap_schema.py b/source4/lib/ldb/tests/python/ldap_schema.py
index 201711d..4ed1d1c 100755
--- a/source4/lib/ldb/tests/python/ldap_schema.py
+++ b/source4/lib/ldb/tests/python/ldap_schema.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This is a port of the original in testprogs/ejs/ldap.js
diff --git a/source4/lib/ldb/tests/python/sec_descriptor.py b/source4/lib/ldb/tests/python/sec_descriptor.py
index 84edd90..4d03c0b 100755
--- a/source4/lib/ldb/tests/python/sec_descriptor.py
+++ b/source4/lib/ldb/tests/python/sec_descriptor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
import getopt
diff --git a/source4/lib/ldb/tests/python/urgent_replication.py b/source4/lib/ldb/tests/python/urgent_replication.py
index 752a95e..b8df072 100755
--- a/source4/lib/ldb/tests/python/urgent_replication.py
+++ b/source4/lib/ldb/tests/python/urgent_replication.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This is a port of the original in testprogs/ejs/ldap.js
diff --git a/source4/lib/messaging/tests/bindings.py b/source4/lib/messaging/tests/bindings.py
index ead7a83..8240a36 100644
--- a/source4/lib/messaging/tests/bindings.py
+++ b/source4/lib/messaging/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Unix SMB/CIFS implementation.
diff --git a/source4/lib/registry/tests/bindings.py b/source4/lib/registry/tests/bindings.py
index 8c3233e..b5115ae 100644
--- a/source4/lib/registry/tests/bindings.py
+++ b/source4/lib/registry/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/source4/libcli/security/tests/bindings.py b/source4/libcli/security/tests/bindings.py
index 6fe3d54..1869728 100644
--- a/source4/libcli/security/tests/bindings.py
+++ b/source4/libcli/security/tests/bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/source4/scripting/bin/autoidl b/source4/scripting/bin/autoidl
index eed4ba3..313ab4b 100755
--- a/source4/scripting/bin/autoidl
+++ b/source4/scripting/bin/autoidl
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Unix SMB/CIFS implementation.
diff --git a/source4/scripting/bin/enablerecyclebin b/source4/scripting/bin/enablerecyclebin
index 0d39fe7..61ad32c 100755
--- a/source4/scripting/bin/enablerecyclebin
+++ b/source4/scripting/bin/enablerecyclebin
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# enabled the Recycle Bin optional feature
#
diff --git a/source4/scripting/bin/fullschema b/source4/scripting/bin/fullschema
index 4a01b6a..2f7d32c 100755
--- a/source4/scripting/bin/fullschema
+++ b/source4/scripting/bin/fullschema
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Works out the full schema
#
diff --git a/source4/scripting/bin/get-descriptors b/source4/scripting/bin/get-descriptors
index f22500b..65be2fe 100755
--- a/source4/scripting/bin/get-descriptors
+++ b/source4/scripting/bin/get-descriptors
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Unix SMB/CIFS implementation.
# A script to compare differences of security descriotors between
diff --git a/source4/scripting/bin/machineaccountccache b/source4/scripting/bin/machineaccountccache
index 5458851..7731f5a 100755
--- a/source4/scripting/bin/machineaccountccache
+++ b/source4/scripting/bin/machineaccountccache
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
import optparse
import sys
diff --git a/source4/scripting/bin/minschema b/source4/scripting/bin/minschema
index 43f7816..6fca074 100755
--- a/source4/scripting/bin/minschema
+++ b/source4/scripting/bin/minschema
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Works out the minimal schema for a set of objectclasses
#
diff --git a/source4/scripting/bin/rebuildextendeddn b/source4/scripting/bin/rebuildextendeddn
index 5ae27aa..eed3a17 100755
--- a/source4/scripting/bin/rebuildextendeddn
+++ b/source4/scripting/bin/rebuildextendeddn
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Unix SMB/CIFS implementation.
# Extended attributes (re)building
diff --git a/source4/scripting/bin/rpcclient b/source4/scripting/bin/rpcclient
index aba4f9d..68b33fe 100755
--- a/source4/scripting/bin/rpcclient
+++ b/source4/scripting/bin/rpcclient
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
import sys, os, string
diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index c11f8db..0edbf6e 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Dump Samba3 data
# Copyright Jelmer Vernooij 2005-2007
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index 4fdd10d..4d54ab4 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# update our DNS names using TSIG-GSS
#
diff --git a/source4/scripting/bin/smbstatus b/source4/scripting/bin/smbstatus
index a9265ea..16559e7 100755
--- a/source4/scripting/bin/smbstatus
+++ b/source4/scripting/bin/smbstatus
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# provide information on connected users and open files
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 6cd3943..63afdc7 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Simple subunit testrunner for python
# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 180786a..0e3f86d 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# vim: expandtab
#
# Copyright (C) Matthieu Patou <mat at matws.net> 2009
diff --git a/source4/scripting/bin/w32err_code.py b/source4/scripting/bin/w32err_code.py
index cad6f6e..4ca6413 100755
--- a/source4/scripting/bin/w32err_code.py
+++ b/source4/scripting/bin/w32err_code.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# Unix SMB/CIFS implementation.
# Copyright (C) Kamen Mazdrashki <kamen.mazdrashki at postpath.com> 2009
diff --git a/source4/scripting/devel/ldapcmp b/source4/scripting/devel/ldapcmp
index 9258e9c..5864ccb 100755
--- a/source4/scripting/devel/ldapcmp
+++ b/source4/scripting/devel/ldapcmp
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Unix SMB/CIFS implementation.
# A script to compare differences of objects and attributes between
diff --git a/source4/setup/provision b/source4/setup/provision
index 9932759..d8e2eb2 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Unix SMB/CIFS implementation.
# provision a Samba4 server
diff --git a/source4/setup/upgrade_from_s3 b/source4/setup/upgrade_from_s3
index b3bf5e7..7f31a0f 100755
--- a/source4/setup/upgrade_from_s3
+++ b/source4/setup/upgrade_from_s3
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Upgrade from Samba3
# Copyright Jelmer Vernooij 2005-2007
--
Samba Shared Repository
More information about the samba-cvs
mailing list