Commit a0c5fb48 authored by Colin Watson's avatar Colin Watson

Remove partial support for emitting translated progress messages with

gettext. Don't panic; d-i still has all the support necessary for this.
debootstrap's own support for doing this outside d-i with gettext's
shell bindings has been completely broken ever since it was added in
2003, though, and nobody has complained. Fixing it would require a big
pile of infrastructure and some non-trivial patches, plus arranging to
copy all the translations over from base-installer, and it just doesn't
seem worth it, so lose the cruft (LP: #188690).

r57848
parent 253678c4
debootstrap (1.0.12) UNRELEASED; urgency=low
[ Otavio Salvador ]
* Improve code to choose between libc packages. Thanks to Luca Favatella
<slackydeb@gmail.com> for first version of the patch.
[ Colin Watson ]
* Remove partial support for emitting translated progress messages with
gettext. Don't panic; d-i still has all the support necessary for this.
debootstrap's own support for doing this outside d-i with gettext's
shell bindings has been completely broken ever since it was added in
2003, though, and nobody has complained. Fixing it would require a big
pile of infrastructure and some non-trivial patches, plus arranging to
copy all the translations over from base-installer, and it just doesn't
seem worth it, so lose the cruft (LP: #188690).
-- Otavio Salvador <otavio@ossystems.com.br> Mon, 16 Mar 2009 09:02:49 -0300
debootstrap (1.0.11) unstable; urgency=low
......
......@@ -14,16 +14,11 @@ if [ "$DEBOOTSTRAP_DIR" = "" ]; then
fi
fi
if [ -x "/usr/bin/gettext" ]; then
USE_GETTEXT_INTERACTION=yes
fi
DEVICES_TARGZ=$DEBOOTSTRAP_DIR/devices.tar.gz
. $DEBOOTSTRAP_DIR/functions
exec 4>&1
GETTEXT_LANG=$LANG
LANG=C
USE_COMPONENTS=main
KEYRING=""
......@@ -123,7 +118,6 @@ if [ $# != 0 ] ; then
error 1 ARG_BFBYHAND "If running debootstrap by hand, don't use --boot-floppies"
fi
USE_BOOTFLOPPIES_INTERACTION=yes
unset USE_GETTEXT_INTERACTION
shift
;;
--debian-installer)
......
......@@ -17,8 +17,6 @@ error () {
(echo "E: $name"
for x in "$@"; do echo "EA: $x"; done
echo "EF: $fmt") >&4
elif [ "$USE_GETTEXT_INTERACTION" ]; then
(printf "E: `LANG=$GETTEXT_LANG gettext debootstrap "$fmt"`\n" "$@") >&4
else
(printf "E: $fmt\n" "$@") >&4
fi
......@@ -34,8 +32,6 @@ warning () {
(echo "W: $name"
for x in "$@"; do echo "WA: $x"; done
echo "WF: $fmt") >&4
elif [ "$USE_GETTEXT_INTERACTION" ]; then
printf "W: `LANG=$GETTEXT_LANG gettext debootstrap "$fmt"`\n" "$@" >&4
else
printf "W: $fmt\n" "$@" >&4
fi
......@@ -50,8 +46,6 @@ info () {
(echo "I: $name"
for x in "$@"; do echo "IA: $x"; done
echo "IF: $fmt") >&4
elif [ "$USE_GETTEXT_INTERACTION" ]; then
printf "I: `LANG=$GETTEXT_LANG gettext debootstrap "$fmt"`\n" "$@" >&4
else
printf "I: $fmt\n" "$@" >&4
fi
......
# info
msgid "Base system installed successfully."
msgid "Configuring required packages..."
msgid "Extracting %s..."
msgid "Installing base packages..."
msgid "Installing core packages..."
msgid "Retrieving %s"
msgid "Unpacking required packages..."
msgid "Validating %s"
msgid "usage: [OPTION]... <suite> <target> [<mirror> [<script>]]"
msgid "Try \`${0##*/} --help' for more information."
# warnings
msgid "%s was corrupt"
msgid "Retrying failed download of %s"
msgid "Failure trying to run: %s"
msgid "Failure while configuring base packages. This will be attempted 5 times."
msgid "Failure while configuring required packages."
msgid "Failure while installing base packages. This will be re-attempted up to five times."
msgid "Failure while unpacking required packages. This will be attempted up to five times."
# errors
msgid "%s was not pre-downloaded"
msgid "%s: No such file or directory"
msgid "Can only use one of --boot-floppies and --debian-installer"
msgid "Couldn't download %s"
msgid "Couldn't work out current architecture"
msgid "Failed getting release file %s"
msgid "If running debootstrap by hand, don't use --boot-floppies"
msgid "If running debootstrap by hand, don't use --debian-installer"
msgid "Interrupt caught ... exiting"
msgid "Invalid Release file, no entry for %s"
msgid "Invalid Release file, no valid components"
msgid "No such script: %s"
msgid "Tarball must be given a complete path"
msgid "Unknown tarball: must be either .tar or .tgz"
msgid "You must specify a suite and a target."
msgid "debootstrap can only run as root"
msgid "no %s. cannot create devices"
msgid "option requires an argument %s"
msgid "unknown download style"
msgid "unknown dselect method"
msgid "unknown location %s"
msgid "unknown mirror style"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment