summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-11 14:32:06 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-11 14:32:06 +0200
commit0be941a3839c26b5fe7d6a0bc5315958bab45410 (patch)
tree3fe93b6ae6d50465bf62312c287a72cb9c592a87
parentfb62c0508aaccbcc91c9fb95d25addc0c2ea2fc1 (diff)
downloadsamba-0be941a3839c26b5fe7d6a0bc5315958bab45410.tar.gz
samba-0be941a3839c26b5fe7d6a0bc5315958bab45410.tar.bz2
samba-0be941a3839c26b5fe7d6a0bc5315958bab45410.zip
Remove python extension from upgrade script.
(This used to be commit 5268649b7ef60a2caae9cdf66dfeaf6d2037aba3)
-rwxr-xr-xsource4/selftest/samba4_tests.sh2
-rwxr-xr-xsource4/setup/upgrade (renamed from source4/setup/upgrade.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 725fde2c7d..9c7e93906c 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -351,7 +351,7 @@ plantest "winreg.python" dc $SUBUNITRUN -U\$USERNAME%\$PASSWORD samba.tests.dcer
plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
rm -rf $PREFIX/upgrade
-plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
+plantest "blackbox.upgrade" none $PYTHON setup/upgrade $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
rm -rf $PREFIX/provision
mkdir $PREFIX/provision
plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision" "$CONFIGURATION"
diff --git a/source4/setup/upgrade.py b/source4/setup/upgrade
index 3bcc57ab64..3bcc57ab64 100755
--- a/source4/setup/upgrade.py
+++ b/source4/setup/upgrade