[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-942808 into
lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #942808 in Zorba: ICU streambuf doesn't, in fact, equate ASCII to
US-ASCII
https://bugs.launchpad.net/zorba/+bug/942808
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027
Fixed bug 942808.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/icu_streambuf.cpp'
--- src/util/icu_streambuf.cpp 2012-02-20 18:12:06 +
+++ src/util/icu_streambuf.cpp 2012-02-28 19:36:18 +
@@ -100,13 +100,19 @@
return conv;
}
-bool icu_streambuf::is_necessary( char const *charset ) {
- //
- // Checking for US-ASCII explicitly isn't necessary since ICU knows about
- // aliases.
- //
- return ucnv_compareNames( charset, ASCII )
-ucnv_compareNames( charset, UTF-8 );
+bool icu_streambuf::is_necessary( char const *cc_charset ) {
+ //
+ // Apparently, ucnv_compareNames() doesn't consider US-ASCII an alias for
+ // ASCII, so check for US-ASCII ourselves.
+ //
+ zstring charset( cc_charset );
+ ascii::trim_whitespace( charset );
+ ascii::to_upper( charset );
+ if ( charset == US-ASCII )
+cc_charset += 3; // skip US-
+
+ return ucnv_compareNames( cc_charset, ASCII )
+ucnv_compareNames( cc_charset, UTF-8 );
}
bool icu_streambuf::is_supported( char const *charset ) {
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
It's kind of cheating. The question is why the ICU comparison didn't work? -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-942808 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-942808-2012-02-28T19-46-04.742Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/bug-942808 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job bug-942808-2012-02-28T19-46-04.742Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-942808 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-942808 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-942808-2012-02-28T20-38-04.132Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
Validation queue job bug-942808-2012-02-28T20-38-04.132Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-942808 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-942808 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 -- https://code.launchpad.net/~paul-lucas/zorba/bug-942808/+merge/95027 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
