diff options
| author | Sam Falkner <Sam.Falkner@Sun.COM> | 2010-02-25 11:47:05 -0700 |
|---|---|---|
| committer | Sam Falkner <Sam.Falkner@Sun.COM> | 2010-02-25 11:47:05 -0700 |
| commit | e4d060fb4c00d44cd578713eb9a921f594b733b8 (patch) | |
| tree | c38276f18cf33dbd25c1451f4d3a92ef8adfc6b3 /usr/src/lib/pyzfs/common/util.py | |
| parent | e69acc927b15c46de46ae637e53e1b808990a5bc (diff) | |
| download | illumos-gate-e4d060fb4c00d44cd578713eb9a921f594b733b8.tar.gz | |
6895223 zfs userspace/groupspace/allow/unallow/holds IOError in Japanese locale
Diffstat (limited to 'usr/src/lib/pyzfs/common/util.py')
| -rw-r--r-- | usr/src/lib/pyzfs/common/util.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr/src/lib/pyzfs/common/util.py b/usr/src/lib/pyzfs/common/util.py index 14d05a8bc1..5ff8d0e751 100644 --- a/usr/src/lib/pyzfs/common/util.py +++ b/usr/src/lib/pyzfs/common/util.py @@ -19,7 +19,7 @@ # # CDDL HEADER END # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -29,6 +29,7 @@ zfs.util.dev -- a file object of /dev/zfs """ import gettext import errno import os +import solaris.misc # Note: this module (zfs.util) should not import zfs.ioctl, because that # would introduce a circular dependency @@ -37,8 +38,11 @@ errno.ENOTSUP = 48 dev = open("/dev/zfs", "w") -_ = gettext.translation("SUNW_OST_OSLIB", "/usr/lib/locale", - fallback=True).gettext +try: + _ = gettext.translation("SUNW_OST_OSLIB", "/usr/lib/locale", + fallback=True).gettext +except: + _ = solaris.misc.gettext def default_repr(self): """A simple __repr__ function.""" |