diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-02-29 00:26:46 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-03-05 09:46:56 +0000 |
| commit | 9c062e1f8b4b9f4b6a1eb19ac8554c6d8443395b (patch) | |
| tree | dba4787cf49718ceb58732986301e5558a8ec456 | |
| parent | 666dc9f6f2e53a75025ee95eef8f23f00b6c7c8c (diff) | |
| download | vyos-live-build-9c062e1f8b4b9f4b6a1eb19ac8554c6d8443395b.tar.gz vyos-live-build-9c062e1f8b4b9f4b6a1eb19ac8554c6d8443395b.zip | |
archives: fix deb-src entry exclusion
the sed commands were missing '-i' to actually modify the file (rather
than output to stdout)
Gbp-Dch: Short
Closes: #952842
| -rwxr-xr-x | scripts/build/bootstrap_archives | 4 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives index 6f878b97d..27a92f02f 100755 --- a/scripts/build/bootstrap_archives +++ b/scripts/build/bootstrap_archives @@ -190,8 +190,8 @@ do if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ] then - # Strip out source archives - sed "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" + # Strip out source archives + sed -i "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" fi fi done diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 08d5e3202..5d005b23c 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -192,8 +192,8 @@ EOF if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ] then - # Strip out source archives - sed "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" + # Strip out source archives + sed -i "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" fi fi done @@ -616,7 +616,7 @@ EOF if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ] then # Strip out source archives - sed "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)" + sed -i "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)" fi fi done |