openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Use the dib python to do cleanup

Browse Source 
In a system where python2 is not installed and /usr/bin/python is not
linked then the cleanup process will fail trying to invoke the python
script. Use the previously determined DIB_PYTHON_EXEC if it's available.

Change-Id: I128292808ccef92cc1803988b35caae5aa6fa541
This commit is contained in:
Jamie Lennox
2017-06-22 11:19:39 +10:00
parent 18a0d970fa
commit aa03e24c30
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/lib/common-functions
View File

@@ -154,7 +154,7 @@ function _get_chroot_processes () {
# Deselect kernel threads, and use a python script to avoid # Deselect kernel threads, and use a python script to avoid
# forking lots and lots of readlink / grep processes on a busy # forking lots and lots of readlink / grep processes on a busy
# system. # system.
ps --ppid 2 -p 2 --deselect -o pid= | xargs python -c ' ps --ppid 2 -p 2 --deselect -o pid= | xargs ${DIB_PYTHON_EXEC:-python} -c '
import os import os
import sys import sys