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
53 lines
1.6 KiB
Bash
Executable File
53 lines
1.6 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright 2014 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
|
|
|
|
# exit directly if DIB_DPKG_MANIFEST is not defined properly
|
|
if [ -z "$DIB_DPKG_MANIFEST" ]; then
|
|
echo "DIB_DPKG_MANIFEST must be set to the location of a manifest file you wish to use"
|
|
exit 0
|
|
elif [ ! -f "$DIB_DPKG_MANIFEST" -o ! -s "$DIB_DPKG_MANIFEST" ]; then
|
|
echo "$DIB_DPKG_MANIFEST is not a valid manifest file."
|
|
echo "You should assign a proper manifest file in DIB_DPKG_MANIFEST"
|
|
exit 1
|
|
fi
|
|
|
|
DIB_DPKG_MANIFEST=$(readlink -f $DIB_DPKG_MANIFEST)
|
|
|
|
# Create the preferences file from the given manifest
|
|
outfile=$(mktemp)
|
|
for package in $(jq -r ".packages[].package" $DIB_DPKG_MANIFEST); do
|
|
version=$(jq -r ".packages[] | select(.package == \"${package}\") |\
|
|
.version" $DIB_DPKG_MANIFEST)
|
|
cat << EOF >> $outfile
|
|
Package: ${package}
|
|
Pin: version ${version}
|
|
Pin-Priority: 1001
|
|
|
|
EOF
|
|
done
|
|
|
|
if [ -s $outfile ]; then
|
|
sudo mv $outfile $TMP_MOUNT_PATH/etc/apt/preferences
|
|
else
|
|
rm $outfile
|
|
fi
|