Rename 'repeat' to 'repeatn', since 'repeat' is a reserved word in zsh;

although strictly speaking this seems like an incompatibility in zsh
when linked to /bin/sh (closes: #340058).

r57242

18 files changed, 52 insertions, 48 deletions

diff --git a/debian/changelog b/debian/changelog
index 914f304..44fde38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ debootstrap (1.0.11) UNRELEASED; urgency=low
   * Fix old Debian scripts and all Ubuntu scripts to cope with Anthony's
     change in 1.0.8 to make --second-stage not bother recalculating required
     and base.
+  * Rename 'repeat' to 'repeatn', since 'repeat' is a reserved word in zsh;
+    although strictly speaking this seems like an incompatibility in zsh
+    when linked to /bin/sh (closes: #340058).
 
  -- Colin Watson <cjwatson@ubuntu.com>  Fri, 31 Oct 2008 13:37:01 +0000
 
diff --git a/functions b/functions
index b9180ba..39c946f 100644
--- a/functions
+++ b/functions
@@ -1096,7 +1096,8 @@ without () {
 	echo
 }
 
-repeat () {
+# Formerly called 'repeat', but that's a reserved word in zsh.
+repeatn () {
 	local n="$1"
 	shift
 	while [ "$n" -gt 0 ]; do
diff --git a/scripts/debian/potato b/scripts/debian/potato
index e7be207..3204c7d 100644
--- a/scripts/debian/potato
+++ b/scripts/debian/potato
@@ -92,7 +92,7 @@ second_stage_install () {
 
     in_target dpkg-preconfigure $(debfor $required $base)
 
-    repeat 5 in_target dpkg --force-depends --unpack $(debfor $required)
+    repeatn 5 in_target dpkg --force-depends --unpack $(debfor $required)
 
     mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
     cp "$TARGET/bin/true" "$TARGET/sbin/start-stop-daemon"
@@ -101,7 +101,7 @@ second_stage_install () {
 
     in_target dpkg --configure --pending --force-configure-any --force-depends
 
-    smallyes '' | repeat 5 in_target dpkg --force-auto-select --force-overwrite --skip-same-version --install $(debfor $base)
+    smallyes '' | repeatn 5 in_target dpkg --force-auto-select --force-overwrite --skip-same-version --install $(debfor $base)
 
     mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
 }
diff --git a/scripts/debian/sarge b/scripts/debian/sarge
index f14ad18..e49a490 100644
--- a/scripts/debian/sarge
+++ b/scripts/debian/sarge
@@ -176,7 +176,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #8
-    smallyes '' | repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
+    smallyes '' | repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
     p 10; progress $baseprog $bases INSTBASE "Installing base system" #18
 
     info CONFREQ "Configuring required packages..."
@@ -202,12 +202,12 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info INSTBASE "Installing base packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #30
-    smallyes '' | repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
+    smallyes '' | repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
 
     rm -f "$TARGET/usr/sbin/sendmail"
     ln -sf /bin/true "$TARGET/usr/sbin/sendmail"
 
-    smallyes '' | repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
+    smallyes '' | repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
 
     rm -f "$TARGET/usr/sbin/sendmail"
     ln -sf exim4 "$TARGET/usr/sbin/sendmail"
diff --git a/scripts/debian/sarge.buildd b/scripts/debian/sarge.buildd
index 585859b..0b9ad9a 100644
--- a/scripts/debian/sarge.buildd
+++ b/scripts/debian/sarge.buildd
@@ -135,7 +135,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #8
-    smallyes '' | repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
+    smallyes '' | repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
     p 10; progress $baseprog $bases INSTBASE "Installing base system" #18
 
     info CONFREQ "Configuring required packages..."
@@ -156,9 +156,9 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info INSTBASE "Installing base packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #30
-    smallyes '' | repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
+    smallyes '' | repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
 
-    smallyes '' | repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
+    smallyes '' | repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
 
     p 9; progress $baseprog $bases INSTBASE "Installing base system" #39
 
diff --git a/scripts/debian/sarge.fakechroot b/scripts/debian/sarge.fakechroot
index 75332cf..36234fa 100644
--- a/scripts/debian/sarge.fakechroot
+++ b/scripts/debian/sarge.fakechroot
@@ -141,7 +141,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #8
-    smallyes '' | repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
+    smallyes '' | repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
     p 10; progress $baseprog $bases INSTBASE "Installing base system" #18
 
     info CONFREQ "Configuring required packages..."
@@ -162,9 +162,9 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info INSTBASE "Installing base packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #30
-    smallyes '' | repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
+    smallyes '' | repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
 
-    smallyes '' | repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
+    smallyes '' | repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
 
     p 9; progress $baseprog $bases INSTBASE "Installing base system" #39
 
diff --git a/scripts/debian/sid b/scripts/debian/sid
index 8685632..e1ee2e6 100644
--- a/scripts/debian/sid
+++ b/scripts/debian/sid
@@ -141,7 +141,7 @@ second_stage_install () {
     exec 7>&1
 
     smallyes '' | 
-     (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+     (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
         dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) |
      dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING
 
@@ -167,14 +167,14 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info UNPACKBASE "Unpacking the base system..."
 
     smallyes '' | 
-     (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+     (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
        dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) |
      dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING
 
     info CONFBASE "Configuring the base system..."
 
     smallyes '' |
-     (repeat 5 \
+     (repeatn 5 \
       in_target_failmsg CONF_BASE_FAIL "Failure while configuring base packages." "" \
       dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
      dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
diff --git a/scripts/debian/woody b/scripts/debian/woody
index b7b9c60..66a1261 100644
--- a/scripts/debian/woody
+++ b/scripts/debian/woody
@@ -161,7 +161,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #8
-    smallyes '' | repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
+    smallyes '' | repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
     p 10; progress $baseprog $bases INSTBASE "Installing base system"  #18
 
     info CONFREQ "Configuring required packages..."
@@ -187,12 +187,12 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info INSTBASE "Installing base packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #30
-    smallyes '' | repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
+    smallyes '' | repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
 
     rm -f "$TARGET/usr/sbin/sendmail"
     ln -sf /bin/true "$TARGET/usr/sbin/sendmail"
 
-    smallyes '' | repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
+    smallyes '' | repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
 
     rm -f "$TARGET/usr/sbin/sendmail"
     ln -sf exim "$TARGET/usr/sbin/sendmail"
diff --git a/scripts/debian/woody.buildd b/scripts/debian/woody.buildd
index 72e7f51..8485135 100644
--- a/scripts/debian/woody.buildd
+++ b/scripts/debian/woody.buildd
@@ -135,7 +135,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #8
-    smallyes '' | repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
+    smallyes '' | repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
     p 10; progress $baseprog $bases INSTBASE "Installing base system" #18
 
     info CONFREQ "Configuring required packages..."
@@ -156,9 +156,9 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info INSTBASE "Installing base packages..."
 
     p; progress $baseprog $bases INSTBASE "Installing base system" #30
-    smallyes '' | repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
+    smallyes '' | repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
 
-    smallyes '' | repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
+    smallyes '' | repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
 
     p 9; progress $baseprog $bases INSTBASE "Installing base system" #39
 
diff --git a/scripts/ubuntu/breezy b/scripts/ubuntu/breezy
index c5b12c5..f8d1083 100644
--- a/scripts/ubuntu/breezy
+++ b/scripts/ubuntu/breezy
@@ -123,7 +123,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
 
@@ -149,14 +149,14 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info UNPACKBASE "Unpacking the base system..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
 
     info CONFBASE "Configuring the base system..."
 
     smallyes '' |
-      (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
+      (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
       dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
 
diff --git a/scripts/ubuntu/dapper b/scripts/ubuntu/dapper
index 1d73de0..a9a2d6d 100644
--- a/scripts/ubuntu/dapper
+++ b/scripts/ubuntu/dapper
@@ -128,7 +128,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
 
@@ -154,14 +154,14 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info UNPACKBASE "Unpacking the base system..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
 
     info CONFBASE "Configuring the base system..."
 
     smallyes '' |
-      (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
+      (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
       dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
 
diff --git a/scripts/ubuntu/edgy b/scripts/ubuntu/edgy
index 5b18575..72ebc9b 100644
--- a/scripts/ubuntu/edgy
+++ b/scripts/ubuntu/edgy
@@ -146,7 +146,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
 
@@ -177,14 +177,14 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info UNPACKBASE "Unpacking the base system..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
 
     info CONFBASE "Configuring the base system..."
 
     smallyes '' |
-      (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
+      (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
       dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
 
diff --git a/scripts/ubuntu/feisty b/scripts/ubuntu/feisty
index 8245772..360607b 100644
--- a/scripts/ubuntu/feisty
+++ b/scripts/ubuntu/feisty
@@ -146,7 +146,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
 
@@ -180,14 +180,14 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info UNPACKBASE "Unpacking the base system..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
 
     info CONFBASE "Configuring the base system..."
 
     smallyes '' |
-      (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
+      (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
       dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
 
diff --git a/scripts/ubuntu/gutsy b/scripts/ubuntu/gutsy
index 59f4742..6c09e53 100644
--- a/scripts/ubuntu/gutsy
+++ b/scripts/ubuntu/gutsy
@@ -136,7 +136,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
       dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
 
@@ -167,14 +167,14 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info UNPACKBASE "Unpacking the base system..."
 
     smallyes '' | 
-      (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
+      (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
       dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 |
       dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
 
     info CONFBASE "Configuring the base system..."
 
     smallyes '' |
-      (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
+      (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" \
       dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 |
       dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
 
diff --git a/scripts/ubuntu/hoary b/scripts/ubuntu/hoary
index 5ed03bf..9c9316c 100644
--- a/scripts/ubuntu/hoary
+++ b/scripts/ubuntu/hoary
@@ -138,7 +138,7 @@ second_stage_install () {
 
     info UNPACKREQ "Unpacking required packages..."
 
-    smallyes '' | (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
+    smallyes '' | (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
 
     baseprog=0
 
@@ -161,7 +161,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     info UNPACKBASE "Unpacking the base system..."
 
-    smallyes '' | (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
+    smallyes '' | (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
 
     baseprog=0
 
@@ -170,7 +170,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     mv "$TARGET/usr/sbin/sendmail" "$TARGET/usr/sbin/sendmail.REAL"
     ln -s /bin/true "$TARGET/usr/sbin/sendmail"
 
-    smallyes '' | (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg --status-fd 8 --force-confold --skip-same-version  --configure -a 8>&1 1>&7 | dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
+    smallyes '' | (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg --status-fd 8 --force-confold --skip-same-version  --configure -a 8>&1 1>&7 | dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
 
     rm -f "$TARGET/usr/sbin/sendmail"
     mv "$TARGET/usr/sbin/sendmail.REAL" "$TARGET/usr/sbin/sendmail"
diff --git a/scripts/ubuntu/hoary.buildd b/scripts/ubuntu/hoary.buildd
index a1e7d1c..2596086 100644
--- a/scripts/ubuntu/hoary.buildd
+++ b/scripts/ubuntu/hoary.buildd
@@ -128,7 +128,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #8
-    smallyes '' | repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
+    smallyes '' | repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
     p 10; progress $baseprog $bases INSTCORE "Installing core packages" #18
 
     info CONFREQ "Configuring required packages..."
@@ -150,9 +150,9 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info INSTCORE "Installing base packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #30
-    smallyes '' | repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
+    smallyes '' | repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
 
-    smallyes '' | repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
+    smallyes '' | repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
 
     p 9; progress $baseprog $bases INSTCORE "Installing core packages" #39
 
diff --git a/scripts/ubuntu/warty b/scripts/ubuntu/warty
index 180063e..0e16a62 100644
--- a/scripts/ubuntu/warty
+++ b/scripts/ubuntu/warty
@@ -125,7 +125,7 @@ second_stage_install () {
 
     info UNPACKREQ "Unpacking required packages..."
 
-    smallyes '' | (repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
+    smallyes '' | (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1
 
     baseprog=0
 
@@ -148,7 +148,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
 
     info UNPACKBASE "Unpacking the base system..."
 
-    smallyes '' | (repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
+    smallyes '' | (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --status-fd 8 --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1
 
     baseprog=0
 
@@ -157,7 +157,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     mv "$TARGET/usr/sbin/sendmail" "$TARGET/usr/sbin/sendmail.REAL"
     ln -s /bin/true "$TARGET/usr/sbin/sendmail"
 
-    smallyes '' | (repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg --status-fd 8 --force-confold --skip-same-version  --configure -a 8>&1 1>&7 | dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
+    smallyes '' | (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg --status-fd 8 --force-confold --skip-same-version  --configure -a 8>&1 1>&7 | dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1
 
     rm -f "$TARGET/usr/sbin/sendmail"
     mv "$TARGET/usr/sbin/sendmail.REAL" "$TARGET/usr/sbin/sendmail"
diff --git a/scripts/ubuntu/warty.buildd b/scripts/ubuntu/warty.buildd
index 7ed460d..b980e45 100644
--- a/scripts/ubuntu/warty.buildd
+++ b/scripts/ubuntu/warty.buildd
@@ -128,7 +128,7 @@ second_stage_install () {
     info UNPACKREQ "Unpacking required packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #8
-    smallyes '' | repeat 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
+    smallyes '' | repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" dpkg --force-depends --unpack $(debfor $required)
     p 10; progress $baseprog $bases INSTCORE "Installing core packages" #18
 
     info CONFREQ "Configuring required packages..."
@@ -150,9 +150,9 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/
     info INSTCORE "Installing base packages..."
 
     p; progress $baseprog $bases INSTCORE "Installing core packages" #30
-    smallyes '' | repeat 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
+    smallyes '' | repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" dpkg --force-auto-select --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base)
 
-    smallyes '' | repeat 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
+    smallyes '' | repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be attempted 5 times." "" dpkg  --force-confold --skip-same-version  --configure -a
 
     p 9; progress $baseprog $bases INSTCORE "Installing core packages" #39