← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/localechooser/jaunty

« back to all changes in this revision

Viewing changes to localechooser

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2008-04-06 13:46:16 UTC
  • Revision ID: james.westby@ubuntu.com-20080406134616-v1ddm8dnat4dx51w
Tags: 1.42ubuntu4
https://launchpad.net/bugs/85162
Allow preseeding of debian-installer/language (LP: #85162).

Show diffs side-by-side

added added

removed removed

Lines of Context:
localechooser
93
93
                                # country as well.
94
94
                                countrypart="${1#*_}"
95
95
                                countrypart="${countrypart%%[@.]*}"
96
 
                                countryline="$(echo "$line" | grep ";$countrypart\$" ||true)"
 
96
                                countryline="$(echo "$line" | grep ";$countrypart\$" | head -n1 ||true)"
97
97
                                if [ "$countryline" ]; then
98
98
                                        echo "${countryline%%;*}"
99
99
                                        return
282
282
if [ "$RET" != true ]; then
283
283
        if db_get $localecode && [ "$RET" ]; then
284
284
                do_preseed $RET
 
285
        elif db_get $languagecode && [ "$RET" ]; then
 
286
                LANGUAGE="$RET"
 
287
                db_fget $languagecode seen
 
288
                seenflag=$RET
 
289
                LANGNAME=$(locale2langname "$LANGUAGE")
 
290
                if [ -n "$LANGNAME" ]; then
 
291
                        db_set $langname_template $LANGNAME
 
292
                        log "Set $langname_template = '$LANGNAME'"
 
293
                        db_fset $langname_template seen $seenflag || true
 
294
                fi
285
295
        fi
286
296
 
287
297
        # Prevent preseeding from being checked a second time