From ac357b9bff815f9f6a852d72f43df1eaa67ec873 Mon Sep 17 00:00:00 2001 From: "Schiefelbein, Andrew (as3525) as3525@att.com" Date: Tue, 10 Dec 2019 15:30:33 -0600 Subject: [PATCH] This is to allow for ganged install of packages instead of single package installations with apt Change-Id: Ifd268e7eca212fb5686b30213c1c7c1e47f5eb25 --- divingbell/templates/bin/_apt.sh.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/divingbell/templates/bin/_apt.sh.tpl b/divingbell/templates/bin/_apt.sh.tpl index f4bb273..e34d8d4 100644 --- a/divingbell/templates/bin/_apt.sh.tpl +++ b/divingbell/templates/bin/_apt.sh.tpl @@ -117,12 +117,12 @@ dpkg --configure -a {{- range $all_apt_packages }} {{- $pkg_name := .name }} if [[ "${CURRENT_PACKAGES[{{ .name | squote }}]+isset}" != "isset"{{- if .version }} || "${CURRENT_PACKAGES[{{ .name | squote }}]}" != {{ .version }}{{- end }} ]]; then - # Run this in case some package installation was interrupted - DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold {{- if .allow_downgrade }} "--allow-downgrades" {{ end }}{{- if .repo }} -t {{ .repo }}{{ end }} {{ .name -}} {{- if .version }}={{ .version }}{{ end }} - INSTALLED_THIS_TIME="$INSTALLED_THIS_TIME {{ .name }}" + INSTALLED_THIS_TIME="$INSTALLED_THIS_TIME {{$pkg_name}} {{- if .version }}={{ .version }}{{ end }}" fi -REQUESTED_PACKAGES="$REQUESTED_PACKAGES {{ .name }}" +REQUESTED_PACKAGES="$REQUESTED_PACKAGES {{$pkg_name}}" {{- end }} +# Run this in case some package installation was interrupted +DEBIAN_FRONTEND=noninteractive apt-get install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold {{- if .allow_downgrade }} "--allow-downgrades" {{ end }}{{- if .repo }} -t {{ .repo }}{{ end }} $INSTALLED_THIS_TIME {{- end }} # Perform package upgrades