e793cc4038
Since the original merge of this code
(04208e7c79) several things have
changed; particularly now we ship dib-run-parts as part of dib, not as
a separate package.
We setup $_LIB to point to the shipped library diretory via
pkg_resources lookups. We now call dib-run-parts (as mentioned,
shipped as a dib library now), source scripts, etc. via $_LIB and thus
do not rely on $PATH. Consequently we don't need this activation
part.
Which is helpful, because "venv" (as opposed to virtualenv) doesn't
have activate_this.py. So this fixes installation under that for
Python 3.
We update the functional tests to use the virtualenv_command exported
by the ensure-pip role, which will test the venv path. There is no
need for dib_python as we are Python 3 only now.
Change-Id: Iede929ea2d278008220aac8b1d678ba41eba0d8a
41 lines
1.4 KiB
Python
41 lines
1.4 KiB
Python
# Copyright 2016 Ian Wienand (iwienand@redhat.com)
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
import os.path
|
|
import sys
|
|
|
|
import diskimage_builder.paths
|
|
|
|
|
|
def main():
|
|
environ = os.environ
|
|
|
|
# pre-seed some paths for the shell script
|
|
environ['_LIB'] = diskimage_builder.paths.get_path('lib')
|
|
|
|
# export the path to the current python
|
|
if not os.environ.get('DIB_PYTHON_EXEC'):
|
|
os.environ['DIB_PYTHON_EXEC'] = sys.executable
|
|
|
|
# we have to handle being called as "disk-image-create" or
|
|
# "ramdisk-image-create". ramdisk-image-create is just a symlink
|
|
# to disk-image-create
|
|
# XXX: we could simplify things by removing the symlink, and
|
|
# just setting IS_RAMDISK in environ here depending on sys.argv[1]
|
|
script = "%s/%s" % (diskimage_builder.paths.get_path('lib'),
|
|
os.path.basename(sys.argv[0]))
|
|
|
|
os.execve("/bin/bash", ['bash', script] + sys.argv[1:], environ)
|