[SCM] debian-live/live-helper branch, master, updated. 1.0_a28-1-12-gde73cdb

[Daniel Baumann (none)]

The branch, master has been updated
       via  de73cdb6d0971ba83f38655ad98e28ec5a7ae146 (commit)
       via  b8518971994f55ae3b029d5bca5e1d783768d8f3 (commit)
      from  42314d320c25e8036bf9b816a7317809ab75aeff (commit)


- Shortlog ------------------------------------------------------------
de73cdb Respecting LH_QUIET for genisoimage/mkisofs calls, thanks to Justin Pryzby <pryzbyj at justinpryzby.com>.
b851897 Respecting LH_QUIET for wget calls, thanks to Justin Pryzby <pryzbyj at justinpryzby.com>.

Summary of changes:
 helpers/lh_binary_debian-installer |   19 ++++++++++++-------
 helpers/lh_binary_iso              |    5 +++++
 helpers/lh_source_iso              |    5 +++++
 3 files changed, 22 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit de73cdb6d0971ba83f38655ad98e28ec5a7ae146
Author: Daniel Baumann <daniel at debian.(none)>
Date:   Sun Sep 23 09:48:07 2007 +0200

    Respecting LH_QUIET for genisoimage/mkisofs calls, thanks to Justin Pryzby <pryzbyj at justinpryzby.com>.

diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 8b00a3d..82ba2a9 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -67,6 +67,11 @@ then
 	rm -f binary.iso
 fi
 
+if [ "${LH_QUIET}" = "enabled" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
+fi
+
 if [ "${LH_VERBOSE}" = "enabled" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso
index b568781..ef7241f 100755
--- a/helpers/lh_source_iso
+++ b/helpers/lh_source_iso
@@ -69,6 +69,11 @@ then
 	rm -f source.iso
 fi
 
+if [ "${LH_QUIET}" = "enabled" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
+fi
+
 if [ "${LH_VERBOSE}" = "enabled" ]
 then
 	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"

commit b8518971994f55ae3b029d5bca5e1d783768d8f3
Author: Daniel Baumann <daniel at debian.(none)>
Date:   Sun Sep 23 09:47:46 2007 +0200

    Respecting LH_QUIET for wget calls, thanks to Justin Pryzby <pryzbyj at justinpryzby.com>.

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 19d084a..6ad8e7b 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -33,6 +33,11 @@ Read_conffile config/source
 Read_conffile "${LH_CONFIG}"
 Set_defaults
 
+if [ "${LH_QUIET}" = "enabled" ]
+then
+	WGET_OPTIONS="${WGET_OPTIONS} --quiet"
+fi
+
 # Setting remote d-i directories
 case "${LH_DEBIAN_INSTALLER}" in
 	enabled|cdrom|netinst|businesscard|live)
@@ -184,15 +189,15 @@ fi
 
 # Downloading debian-installer
 mkdir -p "${DESTDIR_DI}"
-wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL}
-wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz
+wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI}/${DI_KERNEL}
+wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI}/initrd.gz
 
 # Downloading graphical-installer
 if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
 then
 	mkdir -p "${DESTDIR_GI}"
-	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL}
-	wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz
+	wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_GTK}/${DI_KERNEL}
+	wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_GTK}/initrd.gz
 fi
 
 if [ "${LH_DEBIAN_INSTALLER}" != "netboot" ]; then
@@ -294,13 +299,13 @@ gzip -9 -c dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages > di
 cd "${OLDPWD}"
 
 # Fetching release
-wget "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/binary-"${LH_ARCHITECTURE}"/Release -O binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Release
+wget ${WGET_OPTIONS} "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/binary-"${LH_ARCHITECTURE}"/Release -O binary/dists/${LH_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Release
 
 mkdir binary.udeb
 cd binary.udeb
 
 # Downloading udeb indices
-wget "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"/Packages.gz
+wget ${WGET_OPTIONS} "${LH_MIRROR_BOOTSTRAP}"/dists/"${LH_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"/Packages.gz
 gunzip -c Packages.gz > Packages
 
 # Sorting udebs
@@ -315,7 +320,7 @@ do
 		cp ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ./
 	else
 		# Downloading udebs
-		wget "${LH_MIRROR_BOOTSTRAP}"/${UDEB}
+		wget ${WGET_OPTIONS} "${LH_MIRROR_BOOTSTRAP}"/${UDEB}
 	fi
 done
 

-- 
debian-live/live-helper