[Pkg-owncloud-commits] [python-owncloud] 88/96: Revert "Replaced distribute_setup.py with the latest from http://python-distribute.org/distribute_setup.py."
Sandro Knauß
hefee-guest at moszumanska.debian.org
Fri Nov 22 01:28:30 UTC 2013
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository python-owncloud.
commit a160ee0c9992017ee2df02c0fe12522c4f008fa4
Author: Diederik de Haas <github at cknow.org>
Date: Thu Apr 11 22:51:57 2013 +0200
Revert "Replaced distribute_setup.py with the latest from http://python-distribute.org/distribute_setup.py."
This reverts commit bc08bc18747974c830e474085839aa182d788c62.
Instead of just lowering the version number, we should just revert to
the old file (contents).
---
distribute_setup.py | 105 +++++++++++----------------------------------------
1 file changed, 22 insertions(+), 83 deletions(-)
diff --git a/distribute_setup.py b/distribute_setup.py
index 3ca27ca..5a95c92 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -14,14 +14,11 @@ the appropriate options to ``use_setuptools()``.
This file can also be run as a script to install or upgrade setuptools.
"""
import os
-import shutil
import sys
import time
import fnmatch
import tempfile
import tarfile
-import optparse
-
from distutils import log
try:
@@ -66,7 +63,7 @@ Description: xxx
""" % SETUPTOOLS_FAKED_VERSION
-def _install(tarball, install_args=()):
+def _install(tarball):
# extracting the tarball
tmpdir = tempfile.mkdtemp()
log.warn('Extracting in %s', tmpdir)
@@ -84,14 +81,11 @@ def _install(tarball, install_args=()):
# installing
log.warn('Installing Distribute')
- if not _python_cmd('setup.py', 'install', *install_args):
+ if not _python_cmd('setup.py', 'install'):
log.warn('Something went wrong during the installation.')
log.warn('See the error message above.')
- # exitcode will be 2
- return 2
finally:
os.chdir(old_wd)
- shutil.rmtree(tmpdir)
def _build_egg(egg, tarball, to_dir):
@@ -116,7 +110,6 @@ def _build_egg(egg, tarball, to_dir):
finally:
os.chdir(old_wd)
- shutil.rmtree(tmpdir)
# returning the result
log.warn(egg)
if not os.path.exists(egg):
@@ -151,7 +144,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
except ImportError:
return _do_download(version, download_base, to_dir, download_delay)
try:
- pkg_resources.require("distribute>=" + version)
+ pkg_resources.require("distribute>="+version)
return
except pkg_resources.VersionConflict:
e = sys.exc_info()[1]
@@ -174,7 +167,6 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
if not no_fake:
_create_fake_setuptools_pkg_info(to_dir)
-
def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
to_dir=os.curdir, delay=15):
"""Download distribute from a specified location and return its filename
@@ -211,7 +203,6 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
dst.close()
return os.path.realpath(saveto)
-
def _no_sandbox(function):
def __no_sandbox(*args, **kw):
try:
@@ -236,12 +227,9 @@ def _no_sandbox(function):
return __no_sandbox
-
def _patch_file(path, content):
"""Will backup the file then patch it"""
- f = open(path)
- existing_content = f.read()
- f.close()
+ existing_content = open(path).read()
if existing_content == content:
# already patched
log.warn('Already patched.')
@@ -257,21 +245,15 @@ def _patch_file(path, content):
_patch_file = _no_sandbox(_patch_file)
-
def _same_content(path, content):
- f = open(path)
- existing_content = f.read()
- f.close()
- return existing_content == content
-
+ return open(path).read() == content
def _rename_path(path):
new_name = path + '.OLD.%s' % time.time()
- log.warn('Renaming %s to %s', path, new_name)
+ log.warn('Renaming %s into %s', path, new_name)
os.rename(path, new_name)
return new_name
-
def _remove_flat_installation(placeholder):
if not os.path.isdir(placeholder):
log.warn('Unkown installation at %s', placeholder)
@@ -285,7 +267,7 @@ def _remove_flat_installation(placeholder):
log.warn('Could not locate setuptools*.egg-info')
return
- log.warn('Moving elements out of the way...')
+ log.warn('Removing elements out of the way...')
pkg_info = os.path.join(placeholder, file)
if os.path.isdir(pkg_info):
patched = _patch_egg_dir(pkg_info)
@@ -307,13 +289,11 @@ def _remove_flat_installation(placeholder):
_remove_flat_installation = _no_sandbox(_remove_flat_installation)
-
def _after_install(dist):
log.warn('After install bootstrap.')
placeholder = dist.get_command_obj('install').install_purelib
_create_fake_setuptools_pkg_info(placeholder)
-
def _create_fake_setuptools_pkg_info(placeholder):
if not placeholder or not os.path.exists(placeholder):
log.warn('Could not find the install location')
@@ -327,11 +307,7 @@ def _create_fake_setuptools_pkg_info(placeholder):
return
log.warn('Creating %s', pkg_info)
- try:
- f = open(pkg_info, 'w')
- except EnvironmentError:
- log.warn("Don't have permissions to write %s, skipping", pkg_info)
- return
+ f = open(pkg_info, 'w')
try:
f.write(SETUPTOOLS_PKG_INFO)
finally:
@@ -345,10 +321,7 @@ def _create_fake_setuptools_pkg_info(placeholder):
finally:
f.close()
-_create_fake_setuptools_pkg_info = _no_sandbox(
- _create_fake_setuptools_pkg_info
-)
-
+_create_fake_setuptools_pkg_info = _no_sandbox(_create_fake_setuptools_pkg_info)
def _patch_egg_dir(path):
# let's check if it's already patched
@@ -370,7 +343,6 @@ def _patch_egg_dir(path):
_patch_egg_dir = _no_sandbox(_patch_egg_dir)
-
def _before_install():
log.warn('Before install bootstrap.')
_fake_setuptools()
@@ -379,7 +351,7 @@ def _before_install():
def _under_prefix(location):
if 'install' not in sys.argv:
return True
- args = sys.argv[sys.argv.index('install') + 1:]
+ args = sys.argv[sys.argv.index('install')+1:]
for index, arg in enumerate(args):
for option in ('--root', '--prefix'):
if arg.startswith('%s=' % option):
@@ -387,7 +359,7 @@ def _under_prefix(location):
return location.startswith(top_dir)
elif arg == option:
if len(args) > index:
- top_dir = args[index + 1]
+ top_dir = args[index+1]
return location.startswith(top_dir)
if arg == '--user' and USER_SITE is not None:
return location.startswith(USER_SITE)
@@ -404,14 +376,11 @@ def _fake_setuptools():
return
ws = pkg_resources.working_set
try:
- setuptools_dist = ws.find(
- pkg_resources.Requirement.parse('setuptools', replacement=False)
- )
+ setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
+ replacement=False))
except TypeError:
# old distribute API
- setuptools_dist = ws.find(
- pkg_resources.Requirement.parse('setuptools')
- )
+ setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
if setuptools_dist is None:
log.warn('No setuptools distribution found')
@@ -445,7 +414,7 @@ def _fake_setuptools():
res = _patch_egg_dir(setuptools_location)
if not res:
return
- log.warn('Patching complete.')
+ log.warn('Patched done.')
_relaunch()
@@ -453,9 +422,7 @@ def _relaunch():
log.warn('Relaunching...')
# we have to relaunch the process
# pip marker to avoid a relaunch bug
- _cmd1 = ['-c', 'install', '--single-version-externally-managed']
- _cmd2 = ['-c', 'install', '--record']
- if sys.argv[:3] == _cmd1 or sys.argv[:3] == _cmd2:
+ if sys.argv[:3] == ['-c', 'install', '--single-version-externally-managed']:
sys.argv[0] = 'setup.py'
args = [sys.executable] + sys.argv
sys.exit(subprocess.call(args))
@@ -481,7 +448,7 @@ def _extractall(self, path=".", members=None):
# Extract directories with a safe mode.
directories.append(tarinfo)
tarinfo = copy.copy(tarinfo)
- tarinfo.mode = 448 # decimal for oct 0700
+ tarinfo.mode = 448 # decimal for oct 0700
self.extract(tarinfo, path)
# Reverse sort directories.
@@ -508,39 +475,11 @@ def _extractall(self, path=".", members=None):
self._dbg(1, "tarfile: %s" % e)
-def _build_install_args(options):
- """
- Build the arguments to 'python setup.py install' on the distribute package
- """
- install_args = []
- if options.user_install:
- if sys.version_info < (2, 6):
- log.warn("--user requires Python 2.6 or later")
- raise SystemExit(1)
- install_args.append('--user')
- return install_args
-
-def _parse_args():
- """
- Parse the command line for options
- """
- parser = optparse.OptionParser()
- parser.add_option(
- '--user', dest='user_install', action='store_true', default=False,
- help='install in user site package (requires Python 2.6 or later)')
- parser.add_option(
- '--download-base', dest='download_base', metavar="URL",
- default=DEFAULT_URL,
- help='alternative URL from where to download the distribute package')
- options, args = parser.parse_args()
- # positional arguments are ignored
- return options
-
-def main(version=DEFAULT_VERSION):
+def main(argv, version=DEFAULT_VERSION):
"""Install or upgrade setuptools and EasyInstall"""
- options = _parse_args()
- tarball = download_setuptools(download_base=options.download_base)
- return _install(tarball, _build_install_args(options))
+ tarball = download_setuptools()
+ _install(tarball)
+
if __name__ == '__main__':
- sys.exit(main())
+ main(sys.argv[1:])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/python-owncloud.git
More information about the Pkg-owncloud-commits
mailing list