Danek Duvall wrote:
> On Sun, Nov 02, 2008 at 09:45:41AM +0000, jmr wrote:
>
>
>> Webrev: http://cr.opensolaris.org/~jmr/pm_4126_v10_Nov01
>>
>
> client.py:
>
> - line 2025: bad merge? This is reverting changeset 644. The line
> number is off, too, so it looks like you'll need to remerge. Be
> careful.
>
Danek - this is puzzling. I am looking at the changes in client.py that
I have:
2025 refers to changeset 362 that you put in and its there.
I will be remerging the webrev agaisnt the gate inthe next few minutes
and will check it all looks ok.
JR
# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to:
/export/home/jr140578/work/ips_gate_l10n/src
# This patch can be applied using context Tools: Patch action on
respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: client.py
--- client.py Base (BASE)
+++ client.py Locally Modified (Based On LOCAL)
@@ -44,6 +44,7 @@
import getopt
import gettext
+import locale
import itertools
import os
import socket
@@ -1806,7 +1807,7 @@
return 1
if not auth_name and not auth_url:
- usage("image-create requires an authority argument")
+ usage(_("image-create requires an authority argument"))
if not auth_name or not auth_url:
usage(_("image-create requires authority argument to be
of "
@@ -1978,8 +1979,8 @@
__img = img = image.Image()
img.history.client_name = PKG_CLIENT_NAME
- # XXX /usr/lib/locale is OpenSolaris-specific.
- gettext.install("pkg", "/usr/lib/locale")
+ locale.setlocale(locale.LC_ALL, '')
+ gettext.install("pkg", "/usr/share/locale")
try:
opts, pargs = getopt.getopt(sys.argv[1:], "R:D:",
["debug="])
> Other than that, the changes look right, as best I can tell.
>
> Thanks, and sorry this took so long.
>
No worries.
> Danek
>
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
