Skip to content

Allow fixup from path other than original #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ericlundin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow fixup from path other than original #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions clonevirtualenv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def _virtualenv_sys(venv_path):
return lines[0], filter(bool, lines[1:])


def clone_virtualenv(src_dir, dst_dir):
def clone_virtualenv(src_dir, dst_dir, original_dir):
if not os.path.exists(src_dir):
raise UserError('src dir %r does not exist' % src_dir)
if os.path.exists(dst_dir):
Expand All @@ -77,7 +77,7 @@ def clone_virtualenv(src_dir, dst_dir):
ignore=shutil.ignore_patterns('*.pyc'))
version, sys_path = _virtualenv_sys(dst_dir)
logger.info('fixing scripts in bin...')
fixup_scripts(src_dir, dst_dir, version)
fixup_scripts(src_dir, dst_dir, original_dir, version)

has_old = lambda s: any(i for i in s if _dirmatch(i, src_dir))

Expand All @@ -90,7 +90,8 @@ def clone_virtualenv(src_dir, dst_dir):
assert not remaining, _virtualenv_sys(dst_dir)


def fixup_scripts(old_dir, new_dir, version, rewrite_env_python=False):
def fixup_scripts(old_dir, new_dir, original_dir, version,
rewrite_env_python=False):
bin_dir = os.path.join(new_dir, env_bin_dir)
root, dirs, files = next(os.walk(bin_dir))
pybinre = re.compile('pythonw?([0-9]+(\.[0-9]+(\.[0-9]+)?)?)?$')
Expand All @@ -105,17 +106,18 @@ def fixup_scripts(old_dir, new_dir, version, rewrite_env_python=False):
# ignore compiled files
continue
elif file_ == 'activate' or file_.startswith('activate.'):
fixup_activate(os.path.join(root, file_), old_dir, new_dir)
fixup_activate(os.path.join(root, file_), old_dir, new_dir,
original_dir)
elif os.path.islink(filename):
fixup_link(filename, old_dir, new_dir)
fixup_link(filename, old_dir, new_dir, original_dir)
elif os.path.isfile(filename):
fixup_script_(root, file_, old_dir, new_dir, version,
fixup_script_(root, file_, old_dir, new_dir, original_dir, version,
rewrite_env_python=rewrite_env_python)


def fixup_script_(root, file_, old_dir, new_dir, version,
def fixup_script_(root, file_, old_dir, new_dir, original_dir, version,
rewrite_env_python=False):
old_shebang = '#!%s/bin/python' % os.path.normcase(os.path.abspath(old_dir))
old_shebang = '#!%s/bin/python' % os.path.normcase(os.path.abspath(original_dir))
new_shebang = '#!%s/bin/python' % os.path.normcase(os.path.abspath(new_dir))
env_shebang = '#!/usr/bin/env python'

Expand Down Expand Up @@ -164,37 +166,38 @@ def rewrite_shebang(version=None):
return


def fixup_activate(filename, old_dir, new_dir):
def fixup_activate(filename, old_dir, new_dir, original_dir):
logger.debug('fixing %s' % filename)
with open(filename, 'rb') as f:
data = f.read().decode('utf-8')

data = data.replace(old_dir, new_dir)
data = data.replace(original_dir, new_dir)
with open(filename, 'wb') as f:
f.write(data.encode('utf-8'))


def fixup_link(filename, old_dir, new_dir, target=None):
def fixup_link(filename, old_dir, new_dir, original_dir, target=None):
logger.debug('fixing %s' % filename)
if target is None:
target = os.readlink(filename)

origdir = os.path.dirname(os.path.abspath(filename)).replace(
new_dir, old_dir)
new_dir, original_dir)

if not os.path.isabs(target):
target = os.path.abspath(os.path.join(origdir, target))
rellink = True
else:
rellink = False

if _dirmatch(target, old_dir):
if _dirmatch(target, original_dir):
if rellink:
# keep relative links, but don't keep original in case it
# traversed up out of, then back into the venv.
# so, recreate a relative link from absolute.
target = target[len(origdir):].lstrip(os.sep)
else:
target = target.replace(old_dir, new_dir, 1)
target = target.replace(original_dir, new_dir, 1)

# else: links outside the venv, replaced with absolute path to target.
_replace_symlink(filename, target)
Expand All @@ -206,13 +209,13 @@ def _replace_symlink(filename, newtarget):
os.rename(tmpfn, filename)


def fixup_syspath_items(syspath, old_dir, new_dir):
def fixup_syspath_items(syspath, old_dir, new_dir, original_dir):
for path in syspath:
if not os.path.isdir(path):
continue
path = os.path.normcase(os.path.abspath(path))
if _dirmatch(path, old_dir):
path = path.replace(old_dir, new_dir, 1)
if _dirmatch(path, original_dir):
path = path.replace(original_dir, new_dir, 1)
if not os.path.exists(path):
continue
elif not _dirmatch(path, new_dir):
Expand All @@ -221,9 +224,9 @@ def fixup_syspath_items(syspath, old_dir, new_dir):
for file_ in files:
filename = os.path.join(root, file_)
if filename.endswith('.pth'):
fixup_pth_file(filename, old_dir, new_dir)
fixup_pth_file(filename, original_dir, new_dir)
elif filename.endswith('.egg-link'):
fixup_egglink_file(filename, old_dir, new_dir)
fixup_egglink_file(filename, original_dir, new_dir)


def fixup_pth_file(filename, old_dir, new_dir):
Expand Down Expand Up @@ -262,18 +265,28 @@ def main():
dest='verbose',
default=False,
help='verbosity')
parser.add_option('--original-dir',
'-o',
dest='original_dir',
help='The path where this venv was originally built'
' if different from the current path')
options, args = parser.parse_args()
try:
old_dir, new_dir = args
except ValueError:
parser.error("not enough arguments given.")

original_dir = options.original_dir
if not original_dir:
original_dir = old_dir

old_dir = os.path.normpath(os.path.abspath(old_dir))
new_dir = os.path.normpath(os.path.abspath(new_dir))
loglevel = (logging.WARNING, logging.INFO, logging.DEBUG)[min(2,
options.verbose)]
logging.basicConfig(level=loglevel, format='%(message)s')
try:
clone_virtualenv(old_dir, new_dir)
clone_virtualenv(old_dir, new_dir, original_dir)
except UserError:
e = sys.exc_info()[1]
parser.error(str(e))
Expand Down