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

Merge "apt-conf: uninitialised variables fix"

Browse Source
This commit is contained in:
Jenkins
2014-04-17 20:08:50 +00:00
committed by Gerrit Code Review
parent 95cdefebf6 06ccb7484f
commit a4c48d78dd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
elements/apt-conf/extra-data.d/99-override-default-apt-conf
View File

@@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
# Override the default /etc/apt/apt.conf with $DIB_APT_CONF # Override the default /etc/apt/apt.conf with $DIB_APT_CONF
set -eu set -ue
# exit directly if DIB_APT_CONF is not defined properly # exit directly if DIB_APT_CONF is not defined properly
if [ -z "$DIB_APT_CONF" ] ; then if [ -z "${DIB_APT_CONF:-}" ] ; then
echo "DIB_APT_CONF is not set - no apt.conf will be copied in" echo "DIB_APT_CONF is not set - no apt.conf will be copied in"
exit 0 exit 0
elif [ ! -f "$DIB_APT_CONF" ] ; then elif [ ! -f "$DIB_APT_CONF" ] ; then