The original my patch includes the following part but it was lost in the 
integration.
Please fix it below.

--- pkg/src/client.py.orig  2008-10-21 18:52:44.000000000 +0900
+++ pkg/src/client.py   2008-10-29 02:05:40.317422169 +0900
@@ -85,6 +85,7 @@ from pkg.client.retrieve import Datastre

  CLIENT_API_VERSION = 2
  PKG_CLIENT_NAME = "pkg"
+_ = gettext.gettext

  def error(text):
          """Emit an error message prefixed by the command name """


[EMAIL PROTECTED] wrote (10/30/08 03:43 AM):
> The workspace that's exhibiting these problems has both fixes for 4126.
> It looks like there is an additional problem with this putback.
> 
> -j
> 
> On Wed, Oct 29, 2008 at 06:32:52PM +0000, John Rice wrote:
>> J - it did break the gate, it was due to a typo on the Makefile and I sent 
>> out a followup putback a few minutes later. Apologies for any 
>> inconvenience. However, this should have stopped the toplevel make and you 
>> are seeing something else below. The rev below was fully built and 
>> installed for IPS, PM and UM, and smoke tested.
>>
>> Author: John Rice <[EMAIL PROTECTED]>
>> Repository: /hg/pkg/gate
>> Latest revision: 4273ce7f34715431a343c35ee4f1836e3a5b81cb
>> Total changesets: 1
>> Log message:
>> 4126 I10n update for IPS GUI and UM correct a typo
>>
>> Files:
>>      update: src/Makefile
>>
>>
>> JR
>>
>> [EMAIL PROTECTED] wrote:
>>> This putback seems to have broken the gate.
>>>
>>> I'm getting the following traceback on gate bits when I try to perform
>>> an image-create:
>>>
>>> $ pkg image-create -F -a ipkg=http://ipkg.sfbay $PKG_IMAGE
>>> Traceback (most recent call last):
>>>   File "/home/johansen/hg_ws/pgate/proto/root_i386/usr/bin/pkg", line 2123, 
>>> in ?
>>>     __ret = main_func()
>>>   File "/home/johansen/hg_ws/pgate/proto/root_i386/usr/bin/pkg", line 1968, 
>>> in main_func
>>>     gettext.domain("pkg")
>>> AttributeError: 'module' object has no attribute 'domain'
>>>
>>>
>>> -j
>>>
>>> On Wed, Oct 29, 2008 at 08:48:03AM -0700, [EMAIL PROTECTED] wrote:
>>>   
>>>> Author: John Rice <[EMAIL PROTECTED]>
>>>> Repository: /hg/pkg/gate
>>>> Latest revision: 53b78e3428fc743c1e9da4bcf30b0dbeb248d951
>>>> Total changesets: 1
>>>> Log message:
>>>> 4126 I10n update for IPS GUI and UM
>>>>
>>>> Files:
>>>>    create: src/gui/help/C/legal.xml
>>>>     
>>> <...>
>>>
>>> _______________________________________________
>>> pkg-discuss mailing list
>>> [email protected]
>>> http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
>>>   
> 
>> Date: Wed, 29 Oct 2008 08:53:04 -0700 (PDT)
>> From: [EMAIL PROTECTED]
>> Subject: [pkg-discuss] 4126 I10n update for IPS GUI and UM correct a typo
>> To: [email protected]
>>
>> Author: John Rice <[EMAIL PROTECTED]>
>> Repository: /hg/pkg/gate
>> Latest revision: 4273ce7f34715431a343c35ee4f1836e3a5b81cb
>> Total changesets: 1
>> Log message:
>> 4126 I10n update for IPS GUI and UM correct a typo
>>
>> Files:
>>      update: src/Makefile
>> _______________________________________________
>> pkg-discuss mailing list
>> [email protected]
>> http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
> 
>> _______________________________________________
>> pkg-discuss mailing list
>> [email protected]
>> http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
> 
> _______________________________________________
> pkg-discuss mailing list
> [email protected]
> http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
> 

_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss

Reply via email to