[SCM] debian-live/live-helper branch, master, updated. 1.0_a27-1-25-gfd4f95e

[Daniel Baumann]

The branch, master has been updated
       via  fd4f95e8e9f7da4056f28bc2a8cab2477f4c33a6 (commit)
       via  662aea0ac5287087cc081b43397977bcb5602200 (commit)
       via  e789f3869ea83228bdfa3f0c649dce65932e3393 (commit)
      from  f197e4787dc5974d8dd0c1d9709e30cb64dba2aa (commit)


- Shortlog ------------------------------------------------------------
fd4f95e helpers/lh_binary_debian-installer
662aea0 helpers/lh_binary_debian-installer
e789f38 helpers/lh_binary_debian-installer

Summary of changes:
 helpers/lh_binary_debian-installer |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit fd4f95e8e9f7da4056f28bc2a8cab2477f4c33a6
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Sep 14 09:59:49 2007 +0200

    helpers/lh_binary_debian-installer
    
      * Removing both required local and d-i udebs when using live-installer.

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index c88631e..eeb3ea5 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -370,8 +370,13 @@ done
 # Enable live-installer
 if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
 then
+	# Remove local udebs
 	rm -f pool/main/b/base-installer/bootstrap-base_*.udeb
 	rm -rf pool/main/p/pkgsel
+
+	# Remove d-i udebs
+	rm -f bootstrap-base_*.udeb
+	rm -f pkgsel_*.udeb
 fi
 
 # Moving udebs

commit 662aea0ac5287087cc081b43397977bcb5602200
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Sep 14 09:58:11 2007 +0200

    helpers/lh_binary_debian-installer
    
      * Also removing pkgsel.

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index fb43cc5..c88631e 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -371,6 +371,7 @@ done
 if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
 then
 	rm -f pool/main/b/base-installer/bootstrap-base_*.udeb
+	rm -rf pool/main/p/pkgsel
 fi
 
 # Moving udebs

commit e789f3869ea83228bdfa3f0c649dce65932e3393
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 13 11:07:51 2007 +0200

    helpers/lh_binary_debian-installer
    
      * Added forgotten path to bootstrap-base removal.

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 3e2f9d8..fb43cc5 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -370,7 +370,7 @@ done
 # Enable live-installer
 if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
 then
-	rm -f bootstrap-base_*.udeb
+	rm -f pool/main/b/base-installer/bootstrap-base_*.udeb
 fi
 
 # Moving udebs

-- 
debian-live/live-helper