From ffa20df08243c6d19a47ef182a0fa7438f60f800 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Thu, 17 Apr 2008 21:26:34 +0100
Subject: Tidy calls to new Expand_packagelist
---
helpers/lh_binary_local-packageslists | 3 +--
helpers/lh_chroot_local-packageslists | 7 ++-----
helpers/lh_chroot_packageslists | 14 +++-----------
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists
index cc3c87d..5804fa1 100755
--- a/helpers/lh_binary_local-packageslists
+++ b/helpers/lh_binary_local-packageslists
@@ -51,8 +51,7 @@ then
for PACKAGESLIST in config/binary_local-packageslists/*
do
# Generate package list
- Expand_packagelist "$(basename ${PACKAGESLIST})" "config/binary_local-packageslists" "${LH_BASE:-/usr/share/live-helper/lists}/lists" > chroot/root/"$(basename ${PACKAGESLIST})"
-
+ Expand_packagelist "${PACKAGESLIST}" "config/binary_local-packageslists" > chroot/root/"$(basename ${PACKAGESLIST})"
# Downloading additional packages
Chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
diff --git a/helpers/lh_chroot_local-packageslists b/helpers/lh_chroot_local-packageslists
index 8a1bef0..f5fe3bb 100755
--- a/helpers/lh_chroot_local-packageslists
+++ b/helpers/lh_chroot_local-packageslists
@@ -47,11 +47,8 @@ then
for PACKAGES_LIST in config/chroot_local-packageslists/*
do
# Generate package list
- Expand_packagelist \
- "$(basename ${PACKAGES_LIST})" \
- "config/chroot_local-packageslists" \
- "${LH_BASE:-/usr/share/live-helper/lists}/lists" \
- >> chroot/root/chroot_packages
+ Expand_packagelist "${PACKAGES_LIST}" "config/chroot_local-packageslists" \
+ >> chroot/root/chroot_packages
done
# Creating stage file
diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists
index 05d742d..9569550 100755
--- a/helpers/lh_chroot_packageslists
+++ b/helpers/lh_chroot_packageslists
@@ -47,17 +47,9 @@ then
for LIST in ${LH_PACKAGES_LISTS}
do
- if [ -f ${LH_BASE:-/usr/share/live-helper}/lists/"${LIST}" ]
- then
- # Generating package list
- Expand_packagelist \
- "${LIST}" \
- "config/chroot_local-packageslists" \
- "${LH_BASE:-/usr/share/live-helper}/lists" \
- >> chroot/root/chroot_packages
- else
- Echo_warning "skipping installation of unknown packages list '${LIST}'."
- fi
+ # Generating package list
+ Expand_packagelist "${LIST}" "config/chroot_local-packageslists" \
+ >> chroot/root/chroot_packages
done
# Creating stage file
--
cgit v1.0