36b59c001c
There is a wide variety of tracing options through the various shell
scripts. Some use "set -eux", others explicity set xtrace and others
do nothing. There is a "-x" option to bin/disk-image-create but it
doesn't flow down to the many scripts it calls.
This adds a global integer variable set by disk-image-create
DIB_DEBUG_TRACE. All scripts have a stanza added to detect this and
turn on tracing. Any other tracing methods are rolled into this. So
the standard header is
---
if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
set -x
fi
set -eu
set -o pipefail
---
Multiple -x options can be specified to dib-create-image, which
increases the value of DIB_DEBUG_TRACE. If script authors feel their
script should only trace at higher levels, they should modify the
"-gt" value. If they feel it should trace by default, they can modify
the default value also.
Changes to pachset 16 : scripts which currently trace themselves by
default have retained this behaviour with DIB_DEBUG_TRACE defaulting
to "1". This was done by running [1] on patch set 15. See the thread
beginning at [2]
dib-lint is also updated to look for the variable being matched.
[1] https://gist.github.com/ianw/71bbda9e6acc74ccd0fd
[2] http://lists.openstack.org/pipermail/openstack-dev/2014-November/051575.html
Change-Id: I6c5a962260741dcf6f89da9a33b96372a719b7b0
74 lines
2.0 KiB
Bash
Executable File
74 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# 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.
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
# install-packages package [package ...]
|
|
|
|
ACTION=install
|
|
MAP_ELEMENT=""
|
|
|
|
SCRIPTNAME=$(basename $0)
|
|
function show_options () {
|
|
echo "Usage: $SCRIPTNAME [package ...]"
|
|
echo
|
|
echo "Options:"
|
|
echo " -u -- update all packages"
|
|
echo " -e -- erase/remove packages"
|
|
echo " -m -- use custom element package map (Example: -m nova)"
|
|
exit 0
|
|
}
|
|
|
|
install_deb_packages () {
|
|
DEBIAN_FRONTEND=noninteractive \
|
|
http_proxy=${http_proxy:-} https_proxy=${https_proxy:-} \
|
|
no_proxy=${no_proxy:-} \
|
|
apt-get --option "Dpkg::Options::=--force-confold" --assume-yes "$@"
|
|
}
|
|
|
|
TEMP=$(getopt -o hudem: -n $SCRIPTNAME -- "$@")
|
|
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
|
|
eval set -- "$TEMP"
|
|
|
|
while true ; do
|
|
case "$1" in
|
|
-u) install_deb_packages dist-upgrade; exit 0;;
|
|
-e) ACTION="remove"; shift;;
|
|
-m) MAP_ELEMENT=$2; shift 2;;
|
|
-h) show_options;;
|
|
--) shift; break ;;
|
|
*) echo "Error: unsupported option $1."; exit 1;;
|
|
esac
|
|
done
|
|
|
|
PKGS=$@
|
|
if [ -n "$MAP_ELEMENT" ]; then
|
|
if ! PKGS=$(pkg-map --element $MAP_ELEMENT $@); then
|
|
echo "bin/pkg-map error. $PKGS"
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
if [ -z "${PKGS}" ]; then
|
|
echo "Not running install-packages $ACTION with empty packages list"
|
|
else
|
|
install_deb_packages $ACTION $PKGS
|
|
fi
|