From ed9d6e21d4b10ef6837ae204be358d883da9c65b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 31 Oct 2010 14:57:30 +0000 Subject: unify error message Afaics, neither CONF_BASE_FAIL_FIVE nor CONF_BASE_FAIL is used anywhere (in eg, base-installer), so I unified those also. r65230 --- scripts/gutsy | 2 +- scripts/sid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/gutsy b/scripts/gutsy index b93c6b6..24c6a3f 100644 --- a/scripts/gutsy +++ b/scripts/gutsy @@ -203,7 +203,7 @@ echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl" info CONFBASE "Configuring the base system..." smallyes '' | - (repeatn 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 re-attempted up to five 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/sid b/scripts/sid index e46a3cb..afe87d2 100644 --- a/scripts/sid +++ b/scripts/sid @@ -187,7 +187,7 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/ info CONFBASE "Configuring the base system..." smallyes '' | - (repeatn 5 in_target_failmsg CONF_BASE_FAIL "Failure while configuring base packages." "" \ + (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ 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 -- cgit v0.12