summaryrefslogtreecommitdiffstats
path: root/scripts/ubuntu/dapper
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-01-13 19:27:06 (GMT)
committerColin Watson <cjwatson@debian.org>2009-01-13 19:27:06 (GMT)
commit2247086953100aaaefd19147e5aeb3c3e6ee63ee (patch)
treef06ae3305c4c2eef2b7f45056bdb893a95773bef /scripts/ubuntu/dapper
parentd3587e58fe6b46a1361dc8e35258a898b6edb1a2 (diff)
downloaddebootstrap-2247086953100aaaefd19147e5aeb3c3e6ee63ee.zip
debootstrap-2247086953100aaaefd19147e5aeb3c3e6ee63ee.tar.gz
debootstrap-2247086953100aaaefd19147e5aeb3c3e6ee63ee.tar.bz2
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
Diffstat (limited to '')
-rw-r--r--scripts/ubuntu/dapper6
1 files changed, 3 insertions, 3 deletions
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