sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove entry-point for element-info"

Browse Source
This commit is contained in:
Zuul 2020-12-15 00:01:04 +00:00 committed by Gerrit Code Review
commit 6ed5621c5f
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/lib/common-functions
View File

@ -340,7 +340,7 @@ function arg_to_elements() {
# element=$i # element=$i
# path=${image_elements[$i] # path=${image_elements[$i]
# done # done
elinfo_out="$(element-info --env $IMAGE_ELEMENT)" elinfo_out="$(${DIB_PYTHON_EXEC} ${_LIB}/element-info.py --env ${IMAGE_ELEMENT})"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: element-info failed to expand elements." echo "ERROR: element-info failed to expand elements."
exit 1 exit 1

7
diskimage_builder/lib/element-info.py Normal file
View File

@ -0,0 +1,7 @@
import sys
from diskimage_builder.element_dependencies import main
if __name__ == "__main__":
sys.exit(main())

1
setup.cfg
View File

@ -32,7 +32,6 @@ data_files =
[entry_points] [entry_points]
console_scripts = console_scripts =
element-info = diskimage_builder.element_dependencies:main
dib-block-device = diskimage_builder.block_device.cmd:main dib-block-device = diskimage_builder.block_device.cmd:main
disk-image-create = diskimage_builder.disk_image_create:main disk-image-create = diskimage_builder.disk_image_create:main
ramdisk-image-create = diskimage_builder.disk_image_create:main ramdisk-image-create = diskimage_builder.disk_image_create:main