summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-596498-trusted-unsigned-repo
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2013-08-01 12:58:20 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2013-08-01 13:37:52 +0200
commit55732492ddea83e7d97b2e0c3e6799948fc5f152 (patch)
tree639665f9fbd33d4302739c5b1dfa66c6842ab0a8 /test/integration/test-bug-596498-trusted-unsigned-repo
parent0c33605d981ceb78a4761e39043dc79ef9a571b2 (diff)
unset LANGUAGE for showing [Y/n] answer hints
nl_langinfo is used to acquire the YESEXPR of the language used, but it will return the one from LC_MESSAGES, which might be different from the language chosen for display of the question (based on LANGUAGE) so this commit removes the [Y/n] help text from the questions itself and moves it to the prompt creation in which the usage of LC_MESSAGES is forced for it, so that the helptext shown actually represents the characters accepted as input for the question. There is still room for problems of course starting with an untranslated "[Y/n]" but a translated YESEXPR or the problem that the question is asked in a completely different language which might have a conflicting definition of [Y/n] input or the user simple ignores the helptext and assumes that an answer matching the question language is accepted, but the mayority of users will never have this problem to begin with, so we should be fine (or at least a bit finer than before). Closes nothing really, but should at least help a bit with bugs like deb:194614, deb:471102, lp:1205578, and countless others.
Diffstat (limited to 'test/integration/test-bug-596498-trusted-unsigned-repo')
-rwxr-xr-xtest/integration/test-bug-596498-trusted-unsigned-repo4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-bug-596498-trusted-unsigned-repo b/test/integration/test-bug-596498-trusted-unsigned-repo
index 6ebc4a3bb..5c643c40e 100755
--- a/test/integration/test-bug-596498-trusted-unsigned-repo
+++ b/test/integration/test-bug-596498-trusted-unsigned-repo
@@ -27,7 +27,7 @@ aptgetupdate
testequal "$PKGTEXT
WARNING: The following packages cannot be authenticated!
cool
-Install these packages without verification [y/N]? N
+Install these packages without verification? [y/N] N
E: Some packages could not be authenticated" aptget install cool --assume-no -d
find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
@@ -37,7 +37,7 @@ aptgetupdate
testequal "$PKGTEXT
WARNING: The following packages cannot be authenticated!
cool
-Install these packages without verification [y/N]? N
+Install these packages without verification? [y/N] N
E: Some packages could not be authenticated" aptget install cool --assume-no -d
sed -i -e 's#deb#deb [trusted=yes]#' $DEBFILE