bug in live-helper packages.sh, patch included

[phil at pjd.me.uk (Philip Downer)]

Hi Folks,

I just tried to go through reportbug but got confused I'm using 
live-helper from git so I decided to just send an email here, hope thats 
ok please tell me if I should have done it some other way as this is my 
first ever patch.

I've discovered that setting the apt_options and APT_OPTIONS in 
config/common doesn't work, everyone may know about this as there is 
(FIXME) writen next to it, so I did :). I am using a local repository 
and have several packages built by myself that don't have authentication 
and so live-helper would fail with unauthenticated package errors, to 
fix this I first tried adding --allow-unauthenticated to APT_OPTIONS and 
found that this didn't help. Upon further investigation I discovered 
that packages.sh was hardcoded with just the --yes options so I've now 
changed it to use the settings in config/common for both APT and 
APTITUDE which has fixed all my problems, please find my patch below, 
comments would be appreciated.

Regards,

Philip Downer.


diff --git a/functions/packages.sh b/functions/packages.sh
index 1427d6c..2142094 100755
--- a/functions/packages.sh
+++ b/functions/packages.sh
@@ -34,11 +34,11 @@ Install_package ()
        then
                case "${LH_APT}" in
                        apt|apt-get)
-                               Chroot "apt-get install -o 
APT::Install-Recommends=false --yes ${PACKAGES}"
+                               Chroot "apt-get install -o 
APT::Install-Recommends=false ${APT_OPTIONS} ${PACKAGES}"
                                ;;

                        aptitude)
-                               Chroot "aptitude install 
--without-recommends --assume-yes ${PACKAGES}"
+                               Chroot "aptitude install 
--without-recommends ${APTITUDE_OPTIONS} ${PACKAGES}"
                                ;;
                esac
        fi