diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-02-04 22:40:41 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-02-06 23:15:13 +0100 |
| commit | bd9b635a0a867d6b5ffe2e32ffe142374f856096 (patch) | |
| tree | b8f22c941c890680371c3b5dc823c20033a7eb85 /scripts/build | |
| parent | d9a0202d1b1958a9e91601886d36ac50fca22d45 (diff) | |
| download | vyos-live-build-bd9b635a0a867d6b5ffe2e32ffe142374f856096.tar.gz vyos-live-build-bd9b635a0a867d6b5ffe2e32ffe142374f856096.zip | |
Simplyfing automatic pinning in derivative modes.
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/lb_chroot_apt | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt index 95c6159cc..2c79ee6d1 100755 --- a/scripts/build/lb_chroot_apt +++ b/scripts/build/lb_chroot_apt @@ -150,22 +150,28 @@ case "${1}" in progress) if [ ! -e chroot/etc/apt/preferences.d/progress.pref ] then - _DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" + _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" + + _DISTRIBUTIONS="${_DISTRIBUTION}" if [ "${LB_SECURITY}" = "true" ] then - _DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-security" + _DISTRIBUTIONS="${_DISTRIBUTIONS} ${_DISTRIBUTION}-security" fi if [ "${LB_VOLATILE}" = "true" ] then - _DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-updates" + _DISTRIBUTIONS="${_DISTRIBUTIONS} ${_DISTRIBUTION}-updates" fi - if [ "${LB_BACKPORTS}" = "true" ] - then - _DISTRIBUTION="${_DISTRIBUTION} $(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')-backports" - fi + case "${LB_DISTRIBUTION}" in + *-backports) + if [ "${LB_BACKPORTS}" = "true" ] + then + _DISTRIBUTIONS="${_DISTRIBUTIONS} ${_DISTRIBUTION}-backports" + fi + ;; + esac for _DISTRIBUTION in ${_DISTRIBUTIONS} do |