diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-06-15 20:38:36 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-15 20:40:18 +0200 |
| commit | a6988b188f24e16ed0a1b7c5ab9da58e9bfb5bc3 (patch) | |
| tree | 34ce754a33390303ff91d06a210c2a9bfe788892 /scripts/build/lb_chroot_sources | |
| parent | 65ac1c651c517deb260389b8b9c374741a594bbd (diff) | |
| download | vyos-live-build-a6988b188f24e16ed0a1b7c5ab9da58e9bfb5bc3.tar.gz vyos-live-build-a6988b188f24e16ed0a1b7c5ab9da58e9bfb5bc3.zip | |
Renaming repositories option to archives for consistency with debian-policy terminology.
In order to be consistent with terminology used in debian-policy,
we've always tried to use the same names for the same things.
The repository option is one of the last things that were too
late in squeeze release cycle to be renamed in time.
Diffstat (limited to 'scripts/build/lb_chroot_sources')
| -rwxr-xr-x | scripts/build/lb_chroot_sources | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources index 75e73333b..352f3e9f9 100755 --- a/scripts/build/lb_chroot_sources +++ b/scripts/build/lb_chroot_sources @@ -217,10 +217,10 @@ EOF done fi - # Configure third-party repositories - if [ -n "${LB_REPOSITORIES}" ] + # Configure third-party archives + if [ -n "${LB_ARCHIVES}" ] then - for REPOSITORY in ${LB_REPOSITORIES} + for REPOSITORY in ${LB_ARCHIVES} do # ubuntu workaround to allow using live.debian.net if [ "${LB_MODE}" = "ubuntu" ] && [ "${REPOSITORY}" = "live.debian.net" ] @@ -230,9 +230,9 @@ EOF _DISTRIBUTION="${LB_PARENT_DISTRIBUTION}" fi - for PLACE in config/repositories "${LB_BASE}/repositories" + for PLACE in config/archives "${LB_BASE}/archives" do - # Prefer repositories from the config tree + # Prefer archives from the config tree # over the global ones. if ! ls "${PLACE}/${REPOSITORY}"* > /dev/null 2>&1 then @@ -731,17 +731,17 @@ EOF fi fi - # Configure third-party repositories - if [ -n "${LB_REPOSITORIES}" ] + # Configure third-party archives + if [ -n "${LB_ARCHIVES}" ] then - for REPOSITORY in ${LB_REPOSITORIES} + for REPOSITORY in ${LB_ARCHIVES} do # Removing sources.list entries (chroot) rm -f "chroot/etc/apt/sources.list.d/${REPOSITORY}.list" - for PLACE in config/repositories "${LB_BASE}/repositories" + for PLACE in config/archives "${LB_BASE}/archives" do - # Prefer repositories from the config tree + # Prefer archives from the config tree # over the global ones. if ! ls "${PLACE}/${REPOSITORY}"* > /dev/null 2>&1 then |